Final changes to testing