Merge pull request #5628 from ctomc/testsuite-fix

Fix few testsuite intermittent issues
Fail if no exception is thrown