further changes to testing