Fix tests refs #4946