[SQUASH ME] unittests: Fix for previous changes