New changes for the test env.