Fixed maps, added map tester.