Additiona UnitTests fixes