Test tweaks now that constraint names are preserved

Entirely removing special cases (huzzah).