more tests and map updates