refactoring; test improvements
refactoring; test improvements

cyber-dojo/runner_stateless,cyber-dojo/runner,cyber-dojo/runner_stateless,cyber-dojo/runner_stateless,cyber-dojo/runner_stateless,cyber-dojo/runner,cyber-dojo/runner_stateless,cyber-dojo/runner_stateless,cyber-dojo/runner_stateless