moved test classes to separate directory