test suite support; tweaks