Trying to fix tests.
Some tests are actually fixed. 76 failing now.