CON-2325 fix unit tests