tidy up the code
removed unnecessary context for metadata and also ensured test cleanup
Merge branch 'master' of github.com:Clarify/clarify-ruby