Cleaning up tests, fixing some test fails.