Fix unit test issue, start swift implementation