CON-2228: fix unit tests