Refactored rspec to use context
Refactored as per suggestions