Much simplified the test tasks.