reconcile manual tests with some downstream forks