Fix test, refactor Base and Cli runners