Tweaks to test harness and autopep8