Little changes to tests.