before refactoring, double waiting is still annoying, all classes are working according to Test()