core-6120 fix unit test