Fold two related tests into the newly FileCheck-ized test, migrating