[#1658] Fixed unit tests