fixed failing test cases, added BZ comments
Merge remote-tracking branch 'upstream/master'
added missing space
Merge pull request #268 from hhovsepy/master

fixed failing tests, commented failing tests with BZ numbers