Couple minor fixes for UnitTests Fails
All UnitTests pass after fixes