Replace other cmp's against 0 with test