CON-556 | S:EH fixed unit tests