[OE-5156] - initial working further findings
[OE-5156] - complete further finding including fixes to unit tests