Began adding tests
pep8 fixes
More pep8 fixes