BZ added hashmat problem
BZ modify test