Improvements to testing