Add test for interrupt and pep8 cleanup.
Minor cleanup.