Various test updates.