Fix the tests
Update gems