Fixing tests after rewrite of parse engine: t+ mod AHFA renumbering