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