Switched to CMake; merged the testing targets