Changed some methods in BlockMapTest