[#1330] Fix test failures