[OE-5131] fixed tests (copied file from g2.1)