Update gems and refactor mock to double