move some test classes that got missed in the package
name change (in terms of their directory structure)