More unit tests tweaks