WIP 13793 Unit tests fixed