Common: Unit test tweaks