Improve name conflict tests (further)