Use non-made up country+state in checkout spec too

This is so ISO-based translations will work