rename CMake test, clean up makefile a wee bit.