Further tweaks for BU tests.