Remove non-existing testcase from CMakeLists
Merge branch 'buildfix'
Improve as per bombela's suggestions, add test