Refactored requests spec
Refactored feature specs