Improved a bunch of tests.