Touchups to dispatch and level error tests