Minor cleanup regarding exception handling in testutils