cleaned up tests, should work better and more consistent
remove InterruptHandler not needed anymore