More test updates.