Fix gem versions
Upgrade tests for new gem versions