Merge "Adding tests to verify grant and ungrant APIs."