Deleted unused Mixin class
Minor test cleanup - pep8 and emacs MMM mode compatibility
Minor test cleanup - removed '#!/usr/bin/python'
Minor test cleanup -
 - pylint: removed unused capsys args
 - emacs MMM mode compatibility