#189 move test utility classes to separate package
#189 remove unused class