Small changes to these tests.