Add few test and fix all cmp