Clean up test_irq (fix #943)
Merge pull request #943 from Kijewski/issue-943

Clean up test_irq