Turn Expected exception checking around
Fix test ordering
Merge pull request #5634 from ctomc/testsuite-fix

Fix few more intermittent testsuite issues