refactored multiple scenarios into Scenario Outline, ready for pull req
merge with paul: finishing cucs for hw_0