[ALOY-874-2] addition to fix redundant code and failing unit tests