Move old test objects into own files
resolve merge conflict in test.cpp