Deployments should be cleaned up.
Turn expected Exception check around
Merge pull request #5628 from ctomc/testsuite-fix

Fix few testsuite intermittent issues