Fix Gems and Tests