Many use

I agree, it could be a separated commit as a bugfix but the modifications in the backend too and it will be 3 commit for 6 line of modification. Finding "the" commit with a lot of one line commit will not be easier to revert IMO.
I can add a test case but there is already one test case that spoted it.