Refactor tests: Clean up the feature specs