Refactored the feature specs