Fixed failing unit test - TRUNK-4402