partial fix to get validation working with SAME/ANY

 * this still will not handle the case n -> Same/Any -> m where n and
   m are different but expected to be the same
expand test to include transitions from 1/2d to/from Same/Any