Merge "Fix unittest" into projects