Merge unittest files and revise unit test