Standardise exception use in test suite