Removed loop check in __eq__()
Renames of functions; Tests passing