[OE-4513] More tests and fixes