Merge "Adjust tests for newly-exposed Grant functionality" into main