Basic changes to tests.