Changed DSL style for feature specs
Updated feature specs