Fix gem and tests.