REFACTOR Feature specs