Test and fix `commit`