Refactor specs to be slightly simpler
Update gem dependencies