fixes for tests in orchestration