Merged Runner and SingleRunner to make behavior more consistent