more management of test tasks in Tmx.Client; refactoring