Fixing a bunch of tests.