Small changes to testing