[OE-3377] - further progress including unit tests and fixtures