Refactor wording in feature tests
Refactor syntax of feature tests