Update test settings.
Add some extras, update manifest.
pep8-ify