Merge branch 'cleanup'
Clean up test script to use PEP8 style names