CON-2058 | Fix unittests