Two fixes, but mainly cleanups of Python test scripts to appease linters#364

chcg merged 1 commit intobruderstein:masterbruderstein/PythonScript:masterfrom

Ekopalypse:test_scripts_cleanupEkopalypse/PythonScript:test_scripts_cleanupCopy head branch name to clipboard