Finished fixing tests.