[#1262] fix test failures