Merge "Test: Adding Test Cases to AidGroupTest" into main