Make shark-runner non-singleton