More tests and equals()/hashCode() implementations