Added a few tests and equals/toString methods