Made some changes to BlockMapTest