Fixed two unit tests merged issues.