Better equality test (thanks Josh)
Adding more tests