Almost finished refactoring and tests for StepEvaluator and most step classes; 44 of 48 tests passing.