Fixes for UnitTest