fixing unit tests

fixing unit tests after #8335 was merged to early

cc @bantu  @DeepDiver1975