Some various improvements to testing approach.