Fix Core unit test