modify test suite and BlockMatrix
Merge pull request #3 from PasaLab/master

update