[BACKLOG-755] -- fixed source due to failing unit test