#: Saga complete live cycle
#: Code refactor and unitTests fixes