Fixed a lot of test that fail because of the new diffs
Made all tests pass