Changes equality tests to ensure that there is no doubt...
Fixes partially all remaining bugs to pass all the tests