Fixing specs, upgrading rspec, covering edge cases