finished unit test and added third part comment system uyan.
fix some conflicts