Make improvements to BlockManagerTest