Fixing properties for UnitTest