Merge "Add Tests for Exemptions" into main