Update test to use GlobalStaffFactory