Move old test objects into own files