Minor changes to testing