test utility classes are moved to proper place