[bug 6781429] Fixed failing unit tests