Reorganized test tasks a bit.