Improve spec readability
Add Setup specs and refactor to conform to new SOS client interface