updates for tests
Fix up tests some more
Fix pep8/flakes results