Improve CF/DSG 9.2 instance dimension testing

Yeah, should likely use dimensions here.