RUNNING_UNIT_TESTS tweaks.