more tests, .equals, and add