Changes for UnitTests to success on linux platform