Revert "Fix save related unit tests"
Revert "Fix save related unit tests"

This reverts commit 12d3c030bc5343d86d4bd515be44f4fa5d7fce22.

WikiWatershed/model-my-watershed,WikiWatershed/model-my-watershed,WikiWatershed/model-my-watershed,WikiWatershed/model-my-watershed,WikiWatershed/model-my-watershed