Experimental changes to tests.