Improve runner test