Unit tests fail on main

## Description
The unit test suite currently fails on main, most likely due to the changes in the last two commits previous.

## Expected Behavior
make test should have no failures

