Update to testing changes