Latest modifications for BU tests.