Fix to make interrupt work more than once. Closes GH-155.
Make finicky test more reliable