Additional test updates.