Fixed pep8, pylint issues and recreated resources which was causing test failures do to merge conflicts
Merge pull request #889 from timlinux/master

Fixed pep8, pylint issues and recreated resources which was causing test...