pyflakes fix & test-typo cleanup