[#1262] make tests pass