Implementing new logic for test tasks