* Swap id field in grants to ids since that's now standardized * Fix some tests I missed * Update generated resource table