[merge] Fixed failing unit tests