testing suite tweaks