Added missing test file, removed old test files and cleaned up CMakeLists.txt