MDL-28137 unit tests: Fixed up problem with block manager tests when running unit...