Moved to a singleton harness rather than statics in the runner