Add kill_active_call and call in teardown of appropriate tests