BS-9623: fix three tests