Fixing tests, more tests.