move test classes into test directory