Fixed failing Org tests
Filed BZ's and added the decorator to the tests
Fix the Pep8 issue
Merge pull request #353 from tkolhar/master

Fixed failing Org tests