[CMake] Remove testbasicgeometry from tests, add forgotten testmatrix.