Merge "Add mock to test-requirements.txt"