Minor changes to tests.