Revert "Fix unit tests for draw model updates"
Revert "Fix unit tests for draw model updates"

This reverts commit ea6cf495df2e46397455100adbd79c59e7b906a4.

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