Small changes to tests.