Reset the force flag on standard save
Improve unit tests