Teaching for Diversity in Schools