Fix UI and Bl tests