Updates made to testing