(*) Make tests generic.
(*) Fix GraphB level bookkeeping.