fixed failing tests, added bz numbers
Merge pull request #620 from hhovsepy/master

fixed failing tests, added bz numbers