Test to illustrate pre save issue

What I consider to be a simpler example of the issue mentioned in #642.

I've tried to resolve this issue, rather complex, but any idea is welcome.