Fixed a lot of tests.