(x) CTL-402 Fixed all unit tests introduced with the pull request