spec: refactor the runner a bit