+ Fix the problem of matching root
+ Fix up the unit test.