Use exception type in tests instead of exception message
Merge remote branch 'origin/integration/master' into integration/master