Fix spec and cleanup context
Add specs for the other services
Merge pull request #2 from sdorunga1/cleanup-spec

Fix spec and cleanup context