missed some uses of Type
adjust TypeTest to move of Type module