More fixes to automated tests.