[BZ 1049054] fix failing tests