Bridge UI and test fixes