More registry test adjustments.