Fix many of the failing tests
There is still more of them to fix :(