Add simpler @type: @vocab tests before complex cases.