Improve specs
Update gems and fix resulting bugs