More changes to testing.