Simplify and fix interrupt test.