Pep8/pylint fixes
Fixed test_masquerade failure due to not clearing the modulestore
between tests.