CON-605 | Fix unittests