LUN-1413: fixed tests