Merge "Increase test coverage for BlockManager class"