More changes to testing