Updated tests to pep8 standards and code review suggestions