CON-1447: Fix unit tests after code refactor