Merge "Make improvements to BlockManagerTest"