Added TestHelpers
Removed useless imports
Added equality and hashcode