fixed errors where makeMap() had been changed to makeEmptyMap() in superclasses but not subclasses, causing the wrong objects to be tested