fixed  failing tests
fixed output
fixed output
fixed failed tests, added bz ids
Merge pull request #625 from hhovsepy/master

fixed more failing tests