Most tests now work with our map, added RuntimeException