More work on rationalizing and consolidating test data; a lot of pep8 formatting cleanup