conglomerates for tests
added new files to CMakeLists.txt