fix tests associated with th refactoring

Failed in 15m 50s
Build and Test (Tier 1)nix develop --command just tier1
Timed Out
Waited 2s
·
Ran in 15m 49s
Total Job Run Time: 15m 49s