Some more replicated map unittest changes