Merge "Update mock with new methods."