More tests for KEYSPACEs. More fixes