Merge "Update mocking to correct target methods"