Modified map methods, added intern unit tests