New test methods, a bunch of changes in MapManager, new methods in Map