Refactor how features are turned on for Cucumber

* no need to check if features are empty twice
* blocks yielding to passed blocks is confusing
Merge pull request #745 from moneyadviceservice/refactor-cucumber-enable-features

Refactor how features are turned on for Cucumber