Merge "Add more grant tests" into main