minor fixes to CMakeLists, added test from fuerte-devel