Improve CF/DSG 9.2 instance dimension testing

I guess it is not possible that those diverge, as they are not user entered things.  Will remove!