refs #828 Fix tests