Refactoring AHFA state logic: t+ mod AHFA renumbering
Start clean up of tests