Platform Compilation change and UnitTest fix