Flo's Pull Request

@florrain @12and1studio @mrocco64 - I'm creating this pull request so we can collaborate/review the code.
A couple of small things:
* Typically it's frowned upon to have multiple expectations for one spec (in the ideal world, each spec is testing one isolated flow or piece of functionality depending on whether it's unit or integration)
* I'd decide on one way for formatting and stick to it. In places you have `{ 'some_key' => 'some_value' }` with spaces leading and trailing the contents of the hash. In other places you trim those spaces. My personal style preference is Github's Ruby style guide: https://github.com/styleguide/ruby It's used by their entire Ruby team and other than me, a number of other developers on our team such as Charles also follow it closely.