Improve iTerm tests