Refactoring. Use params in classes.
Add tests for runner classes.