Test cleanup: added utility code for generating default equals and hashCode and for catching exceptions
Test cleanup: basic_contract
Test cleanup: fixed NPE
Test cleanup: fixes in helper methods