The Impact of Race-Blind and Test-Optional Admissions on Racial Diversity and Merit