CON-385 Fixing unit test