Add 2nd BU and adapt test script to run on one or the other.