Minor fixes to UnitTests (to reflect latest code changes)