Resolve a logic conflict between recent merged branches.

One branch removed and renamed configuration elements; the other branch started testing them.

This should resolve current CI breakage.