Improve name conflict tests