Getting closer to runOnce for continuous integration support