Move test classes to their own files

Not changing namespaces as this time