Fixed a bunch of tests.