modify test suite and BlockMatrix