Refactoring of test asserts, and orchestrator state