More progress on fixing tests.