Preliminary changes to tests.