[OE-4216] - adding some tests