some minor tweaks to testing