Roll back test changes

We don't need them with the better fix for validation in odi_content_models.