Revert unintended changes to CMakeLists.txt and test scripts.  Please always make sure to leave the original files unpatched when commiting