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

... failures do to merge conflicts