[Fixes#72629376] More complete coverage of teh buddies table.  Also gives some fixup to the agency table