Don't call pre-save twice on update. Fix a bug in the MockInstance class