Improve TestKillDifferentUser to prevent timeout on buildbot