refactored strategy spec