use dedicated test keyspace
fix counter mappers
code tidy