Minor equals method changes
Added new tests