Move test model classes into their own files