Pep8, refactors, and other stuff to make the remaining tests more pythonic(they're 'functional/integration' tests, and will be fixed in subsequent commits