Minor changes to some tests.