Fix lots of test failures.