Job Failed #11595 - some test cases relied on now gone classes

Job #11595 failed for 9ca68496:

Please rewrite, fix or delete failing testcases. Btw. we need more tests...