Adding some more test coverage and PEP8 formatting.