Adding more tests to get back to 100% code coverage, and PEP8 compliance fixes.