re #6669 added test entry to cMakeLists
re #6669 fix merge conflict in cmakelists