[#1018] Fixed broken unit tests