Fixed several test bugs. Extended hash code equals tester to allow for annotations.