Fix tests post #6782