Fixed/restored cmake tests