Reduce size of fixture used by tests
Fix tests. (Just fix the tests to be green)