Added mock to enable better tests