A few changes to testing