Restructure the test data and CMakeList