removed unnecessary usage of isEqual
implemented map retrieval
modified some test names