FIX 6 unit test broken in the previous commit, along with a minor bugfix in a unit test