Fix remaining name conflicts in tests