equals and hashcode generation refactored
test values removed