Further test updates.