[#3435] Fixed failing unit tests