Moved individual type tests to their own files