Revamp exception tests