just moving test classes and small format