Fixing unit tests issue
Fixing for cli controllers