TST/BF: more changes to make sure testcases can be run on live install