[sprint 5] ho_grants fixes and tests