Updates to testing