Test edits

these are my final edits to the testing module, mostly pep8ing it, including imports, etc.