UT/BF: Fixing the tests.