Fixed findbugs and test errors in BlockMapTest