executor test suite refactoring.