Re-adding some hashcodes and equals + all tests passing \o/
Cleaning tests