fixed more pep8 pylint stuff
hack to make tests work?