improvements to testing