Cleanup instrumented-handler tests