Merge "Fix unittests" into tizen