refactoring; support for test task execution