Add InterruptedException awareness to the tests.