Always reset curp after xo_format_data
update tests
update tests
update tests
update tests
update tests