[Unit Tests] Tweak last Unit Tests

* Here we go again...