Fix the broken tests.
Merge pull request #165 from zendesk/pswadi/stage-deletion

Fix the broken tests.