fix save and remove internal mock from tests (bug 967530)
Merge pull request #1726 from andymckay/967530

fix save and remove internal mock from tests (bug 967530)