Refactor testUpdateOneRow
fix conflict