De-stage and rename the last staged test standing
De-stage the remaining all-passing test

Rename it, as there already exists a duplicate file with the same name
but different contents.