Use double instead of mock to avoid spec warnings
Merge pull request #2570 from kirs/no-warnings

Use double instead of mock to avoid spec warnings