Merge pull request #266 from hhovsepy/master

fixed failing tests, commented failing tests with BZ numbers
fixed failing test cases, added BZ comments
Merge remote-tracking branch 'upstream/master'