Refactoring of tasks out of the test vector task in preparation for multiple blocks test task.