Merge "Fix errors in MockProvider unit tests"