Fixed some pylint and pep8 violations
Continued expansion/organization of test suite.