refactoring and completing scenarios
Merge pull request #1 from SuperstarDonkeyJockey/post-deploy-checks

refactoring and completing scenarios