Updates gems, fixed tests
Merge pull request #195 from akloboucnik/update-gems

Upgrade gems, small fixes