Update runnerbase, add tests