puppet 4.0.0 → 4.9.1

data/spec/unit/pops/types/type_calculator_spec.rb

@@ -1,367 +1,385 @@
 require 'spec_helper'
 require 'puppet/pops'
 
+module Puppet::Pops
+module Types
 describe 'The type calculator' do
-  let(:calculator) {  Puppet::Pops::Types::TypeCalculator.new() }
+  let(:calculator) { TypeCalculator.new }
 
   def range_t(from, to)
-   t = Puppet::Pops::Types::PIntegerType.new
-   t.from = from
-   t.to = to
-   t
-  end
-  def constrained_t(t, from, to)
-    Puppet::Pops::Types::TypeFactory.constrain_size(t, from, to)
+   PIntegerType.new(from, to)
   end
 
   def pattern_t(*patterns)
-    Puppet::Pops::Types::TypeFactory.pattern(*patterns)
+    TypeFactory.pattern(*patterns)
   end
 
   def regexp_t(pattern)
-    Puppet::Pops::Types::TypeFactory.regexp(pattern)
+    TypeFactory.regexp(pattern)
   end
 
-  def string_t(*strings)
-    Puppet::Pops::Types::TypeFactory.string(*strings)
+  def string_t(string = nil)
+    TypeFactory.string(string)
   end
 
-  def callable_t(*params)
-    Puppet::Pops::Types::TypeFactory.callable(*params)
-  end
-  def all_callables_t(*params)
-    Puppet::Pops::Types::TypeFactory.all_callables()
+  def constrained_string_t(size_type)
+    TypeFactory.string(size_type)
   end
 
-  def with_block_t(callable_t, *params)
-    Puppet::Pops::Types::TypeFactory.with_block(callable_t, *params)
+  def callable_t(*params)
+    TypeFactory.callable(*params)
   end
 
-  def with_optional_block_t(callable_t, *params)
-    Puppet::Pops::Types::TypeFactory.with_optional_block(callable_t, *params)
+  def all_callables_t
+    TypeFactory.all_callables
   end
 
   def enum_t(*strings)
-    Puppet::Pops::Types::TypeFactory.enum(*strings)
+    TypeFactory.enum(*strings)
   end
 
   def variant_t(*types)
-    Puppet::Pops::Types::TypeFactory.variant(*types)
+    TypeFactory.variant(*types)
+  end
+
+  def type_alias_t(name, type_string)
+    type_expr = Parser::EvaluatingParser.new.parse_string(type_string).current
+    TypeFactory.type_alias(name, type_expr)
   end
 
-  def integer_t()
-    Puppet::Pops::Types::TypeFactory.integer()
+  def type_reference_t(type_string)
+    TypeFactory.type_reference(type_string)
   end
 
-  def array_t(t)
-    Puppet::Pops::Types::TypeFactory.array_of(t)
+  def integer_t
+    TypeFactory.integer
   end
 
-  def hash_t(k,v)
-    Puppet::Pops::Types::TypeFactory.hash_of(v, k)
+  def array_t(t, s = nil)
+    TypeFactory.array_of(t, s)
   end
 
-  def data_t()
-    Puppet::Pops::Types::TypeFactory.data()
+  def empty_array_t
+  empty_array = array_t(unit_t, range_t(0,0))
   end
 
-  def factory()
-    Puppet::Pops::Types::TypeFactory
+  def hash_t(k,v,s = nil)
+    TypeFactory.hash_of(v, k, s)
   end
 
-  def collection_t()
-    Puppet::Pops::Types::TypeFactory.collection()
+  def data_t
+    TypeFactory.data
+  end
+
+  def factory
+    TypeFactory
+  end
+
+  def collection_t(size_type = nil)
+    TypeFactory.collection(size_type)
   end
 
   def tuple_t(*types)
-    Puppet::Pops::Types::TypeFactory.tuple(*types)
+    TypeFactory.tuple(types)
+  end
+
+  def constrained_tuple_t(size_type, *types)
+    TypeFactory.tuple(types, size_type)
   end
 
   def struct_t(type_hash)
-    Puppet::Pops::Types::TypeFactory.struct(type_hash)
+    TypeFactory.struct(type_hash)
   end
 
   def object_t
-    Puppet::Pops::Types::TypeFactory.any()
+    TypeFactory.any
   end
 
   def optional_t(t)
-    Puppet::Pops::Types::TypeFactory.optional(t)
+    TypeFactory.optional(t)
+  end
+
+  def type_t(t)
+    TypeFactory.type_type(t)
+  end
+
+  def not_undef_t(t = nil)
+    TypeFactory.not_undef(t)
   end
 
   def undef_t
-    Puppet::Pops::Types::TypeFactory.undef
+    TypeFactory.undef
   end
 
   def unit_t
     # Cannot be created via factory, the type is private to the type system
-    Puppet::Pops::Types::PUnitType.new
+    PUnitType::DEFAULT
   end
 
   def types
-    Puppet::Pops::Types
-  end
-
-  shared_context "types_setup" do
-
-    # Do not include the special type Unit in this list
-    def all_types
-      [ Puppet::Pops::Types::PAnyType,
-        Puppet::Pops::Types::PUndefType,
-        Puppet::Pops::Types::PDataType,
-        Puppet::Pops::Types::PScalarType,
-        Puppet::Pops::Types::PStringType,
-        Puppet::Pops::Types::PNumericType,
-        Puppet::Pops::Types::PIntegerType,
-        Puppet::Pops::Types::PFloatType,
-        Puppet::Pops::Types::PRegexpType,
-        Puppet::Pops::Types::PBooleanType,
-        Puppet::Pops::Types::PCollectionType,
-        Puppet::Pops::Types::PArrayType,
-        Puppet::Pops::Types::PHashType,
-        Puppet::Pops::Types::PRuntimeType,
-        Puppet::Pops::Types::PHostClassType,
-        Puppet::Pops::Types::PResourceType,
-        Puppet::Pops::Types::PPatternType,
-        Puppet::Pops::Types::PEnumType,
-        Puppet::Pops::Types::PVariantType,
-        Puppet::Pops::Types::PStructType,
-        Puppet::Pops::Types::PTupleType,
-        Puppet::Pops::Types::PCallableType,
-        Puppet::Pops::Types::PType,
-        Puppet::Pops::Types::POptionalType,
-        Puppet::Pops::Types::PDefaultType,
-      ]
-    end
-
-    def scalar_types
-      # PVariantType is also scalar, if its types are all Scalar
-      [
-        Puppet::Pops::Types::PScalarType,
-        Puppet::Pops::Types::PStringType,
-        Puppet::Pops::Types::PNumericType,
-        Puppet::Pops::Types::PIntegerType,
-        Puppet::Pops::Types::PFloatType,
-        Puppet::Pops::Types::PRegexpType,
-        Puppet::Pops::Types::PBooleanType,
-        Puppet::Pops::Types::PPatternType,
-        Puppet::Pops::Types::PEnumType,
-      ]
-    end
-
-    def numeric_types
-      # PVariantType is also numeric, if its types are all numeric
-      [
-        Puppet::Pops::Types::PNumericType,
-        Puppet::Pops::Types::PIntegerType,
-        Puppet::Pops::Types::PFloatType,
-      ]
-    end
-
-    def string_types
-      # PVariantType is also string type, if its types are all compatible
-      [
-        Puppet::Pops::Types::PStringType,
-        Puppet::Pops::Types::PPatternType,
-        Puppet::Pops::Types::PEnumType,
-      ]
-    end
-
-    def collection_types
-      # PVariantType is also string type, if its types are all compatible
-      [
-        Puppet::Pops::Types::PCollectionType,
-        Puppet::Pops::Types::PHashType,
-        Puppet::Pops::Types::PArrayType,
-        Puppet::Pops::Types::PStructType,
-        Puppet::Pops::Types::PTupleType,
-      ]
-    end
-
-    def data_compatible_types
-      result = scalar_types
-      result << Puppet::Pops::Types::PDataType
-      result << array_t(types::PDataType.new)
-      result << types::TypeFactory.hash_of_data
-      result << Puppet::Pops::Types::PUndefType
-      tmp = tuple_t(types::PDataType.new)
-      result << (tmp)
-      tmp.size_type = range_t(0, nil)
-      result
-    end
-
-    def type_from_class(c)
-      c.is_a?(Class) ? c.new : c
-    end
+    Types
   end
 
   context 'when inferring ruby' do
 
     it 'fixnum translates to PIntegerType' do
-      expect(calculator.infer(1).class).to eq(Puppet::Pops::Types::PIntegerType)
+      expect(calculator.infer(1).class).to eq(PIntegerType)
     end
 
     it 'large fixnum (or bignum depending on architecture) translates to PIntegerType' do
-      expect(calculator.infer(2**33).class).to eq(Puppet::Pops::Types::PIntegerType)
+      expect(calculator.infer(2**33).class).to eq(PIntegerType)
     end
 
     it 'float translates to PFloatType' do
-      expect(calculator.infer(1.3).class).to eq(Puppet::Pops::Types::PFloatType)
+      expect(calculator.infer(1.3).class).to eq(PFloatType)
     end
 
     it 'string translates to PStringType' do
-      expect(calculator.infer('foo').class).to eq(Puppet::Pops::Types::PStringType)
+      expect(calculator.infer('foo').class).to eq(PStringType)
     end
 
     it 'inferred string type knows the string value' do
       t = calculator.infer('foo')
-      expect(t.class).to eq(Puppet::Pops::Types::PStringType)
-      expect(t.values).to eq(['foo'])
+      expect(t.class).to eq(PStringType)
+      expect(t.value).to eq('foo')
     end
 
     it 'boolean true translates to PBooleanType' do
-      expect(calculator.infer(true).class).to eq(Puppet::Pops::Types::PBooleanType)
+      expect(calculator.infer(true).class).to eq(PBooleanType)
     end
 
     it 'boolean false translates to PBooleanType' do
-      expect(calculator.infer(false).class).to eq(Puppet::Pops::Types::PBooleanType)
+      expect(calculator.infer(false).class).to eq(PBooleanType)
     end
 
     it 'regexp translates to PRegexpType' do
-      expect(calculator.infer(/^a regular expression$/).class).to eq(Puppet::Pops::Types::PRegexpType)
+      expect(calculator.infer(/^a regular expression$/).class).to eq(PRegexpType)
+    end
+
+    it 'iterable translates to PIteratorType' do
+      expect(calculator.infer(Iterable.on(1))).to be_a(PIteratorType)
     end
 
     it 'nil translates to PUndefType' do
-      expect(calculator.infer(nil).class).to eq(Puppet::Pops::Types::PUndefType)
+      expect(calculator.infer(nil).class).to eq(PUndefType)
     end
 
-    it ':undef translates to PRuntimeType' do
-      expect(calculator.infer(:undef).class).to eq(Puppet::Pops::Types::PRuntimeType)
+    it ':undef translates to PUndefType' do
+      expect(calculator.infer(:undef).class).to eq(PUndefType)
     end
 
     it 'an instance of class Foo translates to PRuntimeType[ruby, Foo]' do
-      class Foo
+      ::Foo = Class.new
+      begin
+        t = calculator.infer(::Foo.new)
+        expect(t.class).to eq(PRuntimeType)
+        expect(t.runtime).to eq(:ruby)
+        expect(t.runtime_type_name).to eq('Foo')
+      ensure
+        Object.send(:remove_const, :Foo)
+      end
+    end
+
+    it 'Class Foo translates to PType[PRuntimeType[ruby, Foo]]' do
+      ::Foo = Class.new
+      begin
+        t = calculator.infer(::Foo)
+        expect(t.class).to eq(PType)
+        tt = t.type
+        expect(tt.class).to eq(PRuntimeType)
+        expect(tt.runtime).to eq(:ruby)
+        expect(tt.runtime_type_name).to eq('Foo')
+      ensure
+        Object.send(:remove_const, :Foo)
+      end
+    end
+
+    it 'Module FooModule translates to PType[PRuntimeType[ruby, FooModule]]' do
+      ::FooModule = Module.new
+      begin
+        t = calculator.infer(::FooModule)
+        expect(t.class).to eq(PType)
+        tt = t.type
+        expect(tt.class).to eq(PRuntimeType)
+        expect(tt.runtime).to eq(:ruby)
+        expect(tt.runtime_type_name).to eq('FooModule')
+      ensure
+        Object.send(:remove_const, :FooModule)
+      end
+    end
+
+    context 'sensitive' do
+      it 'translates to PSensitiveType' do
+        expect(calculator.infer(PSensitiveType::Sensitive.new("hunter2")).class).to eq(PSensitiveType)
+      end
+    end
+
+    context 'binary' do
+      it 'translates to PBinaryType' do
+        expect(calculator.infer(PBinaryType::Binary.from_binary_string("binary")).class).to eq(PBinaryType)
+      end
+    end
+
+    context 'version' do
+      it 'translates to PVersionType' do
+        expect(calculator.infer(SemanticPuppet::Version.new(1,0,0)).class).to eq(PSemVerType)
+      end
+
+      it 'range translates to PVersionRangeType' do
+        expect(calculator.infer(SemanticPuppet::VersionRange.parse('1.x')).class).to eq(PSemVerRangeType)
       end
 
-      t = calculator.infer(Foo.new)
-      expect(t.class).to eq(Puppet::Pops::Types::PRuntimeType)
-      expect(t.runtime).to eq(:ruby)
-      expect(t.runtime_type_name).to eq('Foo')
+      it 'translates to a limited PVersionType by infer_set' do
+        v = SemanticPuppet::Version.new(1,0,0)
+        t = calculator.infer_set(v)
+        expect(t.class).to eq(PSemVerType)
+        expect(t.ranges.size).to eq(1)
+        expect(t.ranges[0].min).to eq(v)
+        expect(t.ranges[0].max).to eq(v)
+      end
+    end
+
+    context 'timespan' do
+      it 'translates to PTimespanType' do
+        expect(calculator.infer(Time::Timespan.from_fields_hash('days' => 2))).to be_a(PTimespanType)
+      end
+
+      it 'translates to a limited PTimespanType by infer_set' do
+        ts = Time::Timespan.from_fields_hash('days' => 2)
+        t = calculator.infer_set(ts)
+        expect(t.class).to eq(PTimespanType)
+        expect(t.from).to be(ts)
+        expect(t.to).to be(ts)
+      end
+    end
+
+    context 'timestamp' do
+      it 'translates to PTimespanType' do
+        expect(calculator.infer(Time::Timestamp.now)).to be_a(PTimestampType)
+      end
+
+      it 'translates to a limited PTimespanType by infer_set' do
+        ts = Time::Timestamp.now
+        t = calculator.infer_set(ts)
+        expect(t.class).to eq(PTimestampType)
+        expect(t.from).to be(ts)
+        expect(t.to).to be(ts)
+      end
     end
 
     context 'array' do
       it 'translates to PArrayType' do
-        expect(calculator.infer([1,2]).class).to eq(Puppet::Pops::Types::PArrayType)
+        expect(calculator.infer([1,2]).class).to eq(PArrayType)
       end
 
       it 'with fixnum values translates to PArrayType[PIntegerType]' do
-        expect(calculator.infer([1,2]).element_type.class).to eq(Puppet::Pops::Types::PIntegerType)
+        expect(calculator.infer([1,2]).element_type.class).to eq(PIntegerType)
       end
 
       it 'with 32 and 64 bit integer values translates to PArrayType[PIntegerType]' do
-        expect(calculator.infer([1,2**33]).element_type.class).to eq(Puppet::Pops::Types::PIntegerType)
+        expect(calculator.infer([1,2**33]).element_type.class).to eq(PIntegerType)
       end
 
       it 'Range of integer values are computed' do
         t = calculator.infer([-3,0,42]).element_type
-        expect(t.class).to eq(Puppet::Pops::Types::PIntegerType)
+        expect(t.class).to eq(PIntegerType)
         expect(t.from).to eq(-3)
         expect(t.to).to eq(42)
       end
 
-      it "Compound string values are computed" do
+      it 'Compound string values are converted to enums' do
         t = calculator.infer(['a','b', 'c']).element_type
-        expect(t.class).to eq(Puppet::Pops::Types::PStringType)
+        expect(t.class).to eq(PEnumType)
         expect(t.values).to eq(['a', 'b', 'c'])
       end
 
       it 'with fixnum and float values translates to PArrayType[PNumericType]' do
-        expect(calculator.infer([1,2.0]).element_type.class).to eq(Puppet::Pops::Types::PNumericType)
+        expect(calculator.infer([1,2.0]).element_type.class).to eq(PNumericType)
       end
 
       it 'with fixnum and string values translates to PArrayType[PScalarType]' do
-        expect(calculator.infer([1,'two']).element_type.class).to eq(Puppet::Pops::Types::PScalarType)
+        expect(calculator.infer([1,'two']).element_type.class).to eq(PScalarType)
       end
 
       it 'with float and string values translates to PArrayType[PScalarType]' do
-        expect(calculator.infer([1.0,'two']).element_type.class).to eq(Puppet::Pops::Types::PScalarType)
+        expect(calculator.infer([1.0,'two']).element_type.class).to eq(PScalarType)
       end
 
       it 'with fixnum, float, and string values translates to PArrayType[PScalarType]' do
-        expect(calculator.infer([1, 2.0,'two']).element_type.class).to eq(Puppet::Pops::Types::PScalarType)
+        expect(calculator.infer([1, 2.0,'two']).element_type.class).to eq(PScalarType)
       end
 
       it 'with fixnum and regexp values translates to PArrayType[PScalarType]' do
-        expect(calculator.infer([1, /two/]).element_type.class).to eq(Puppet::Pops::Types::PScalarType)
+        expect(calculator.infer([1, /two/]).element_type.class).to eq(PScalarType)
       end
 
       it 'with string and regexp values translates to PArrayType[PScalarType]' do
-        expect(calculator.infer(['one', /two/]).element_type.class).to eq(Puppet::Pops::Types::PScalarType)
+        expect(calculator.infer(['one', /two/]).element_type.class).to eq(PScalarType)
       end
 
       it 'with string and symbol values translates to PArrayType[PAnyType]' do
-        expect(calculator.infer(['one', :two]).element_type.class).to eq(Puppet::Pops::Types::PAnyType)
+        expect(calculator.infer(['one', :two]).element_type.class).to eq(PAnyType)
       end
 
       it 'with fixnum and nil values translates to PArrayType[PIntegerType]' do
-        expect(calculator.infer([1, nil]).element_type.class).to eq(Puppet::Pops::Types::PIntegerType)
+        expect(calculator.infer([1, nil]).element_type.class).to eq(PIntegerType)
       end
 
       it 'with arrays of string values translates to PArrayType[PArrayType[PStringType]]' do
-        et = calculator.infer([['first' 'array'], ['second','array']])
-        expect(et.class).to eq(Puppet::Pops::Types::PArrayType)
+        et = calculator.infer([['first', 'array'], ['second','array']])
+        expect(et.class).to eq(PArrayType)
         et = et.element_type
-        expect(et.class).to eq(Puppet::Pops::Types::PArrayType)
+        expect(et.class).to eq(PArrayType)
         et = et.element_type
-        expect(et.class).to eq(Puppet::Pops::Types::PStringType)
+        expect(et.class).to eq(PEnumType)
       end
 
       it 'with array of string values and array of fixnums translates to PArrayType[PArrayType[PScalarType]]' do
-        et = calculator.infer([['first' 'array'], [1,2]])
-        expect(et.class).to eq(Puppet::Pops::Types::PArrayType)
+        et = calculator.infer([['first', 'array'], [1,2]])
+        expect(et.class).to eq(PArrayType)
         et = et.element_type
-        expect(et.class).to eq(Puppet::Pops::Types::PArrayType)
+        expect(et.class).to eq(PArrayType)
         et = et.element_type
-        expect(et.class).to eq(Puppet::Pops::Types::PScalarType)
+        expect(et.class).to eq(PScalarType)
       end
 
-      it 'with hashes of string values translates to PArrayType[PHashType[PStringType]]' do
+      it 'with hashes of string values translates to PArrayType[PHashType[PEnumType]]' do
         et = calculator.infer([{:first => 'first', :second => 'second' }, {:first => 'first', :second => 'second' }])
-        expect(et.class).to eq(Puppet::Pops::Types::PArrayType)
-        et = et.element_type
-        expect(et.class).to eq(Puppet::Pops::Types::PHashType)
+        expect(et.class).to eq(PArrayType)
         et = et.element_type
-        expect(et.class).to eq(Puppet::Pops::Types::PStringType)
+        expect(et.class).to eq(PHashType)
+        et = et.value_type
+        expect(et.class).to eq(PEnumType)
       end
 
       it 'with hash of string values and hash of fixnums translates to PArrayType[PHashType[PScalarType]]' do
         et = calculator.infer([{:first => 'first', :second => 'second' }, {:first => 1, :second => 2 }])
-        expect(et.class).to eq(Puppet::Pops::Types::PArrayType)
+        expect(et.class).to eq(PArrayType)
         et = et.element_type
-        expect(et.class).to eq(Puppet::Pops::Types::PHashType)
-        et = et.element_type
-        expect(et.class).to eq(Puppet::Pops::Types::PScalarType)
+        expect(et.class).to eq(PHashType)
+        et = et.value_type
+        expect(et.class).to eq(PScalarType)
       end
     end
 
     context 'hash' do
       it 'translates to PHashType' do
-        expect(calculator.infer({:first => 1, :second => 2}).class).to eq(Puppet::Pops::Types::PHashType)
+        expect(calculator.infer({:first => 1, :second => 2}).class).to eq(PHashType)
       end
 
       it 'with symbolic keys translates to PHashType[PRuntimeType[ruby, Symbol], value]' do
         k = calculator.infer({:first => 1, :second => 2}).key_type
-        expect(k.class).to eq(Puppet::Pops::Types::PRuntimeType)
+        expect(k.class).to eq(PRuntimeType)
         expect(k.runtime).to eq(:ruby)
         expect(k.runtime_type_name).to eq('Symbol')
       end
 
-      it 'with string keys translates to PHashType[PStringType, value]' do
-        expect(calculator.infer({'first' => 1, 'second' => 2}).key_type.class).to eq(Puppet::Pops::Types::PStringType)
+      it 'with string keys translates to PHashType[PEnumType, value]' do
+        expect(calculator.infer({'first' => 1, 'second' => 2}).key_type.class).to eq(PEnumType)
       end
 
       it 'with fixnum values translates to PHashType[key, PIntegerType]' do
-        expect(calculator.infer({:first => 1, :second => 2}).element_type.class).to eq(Puppet::Pops::Types::PIntegerType)
+        expect(calculator.infer({:first => 1, :second => 2}).value_type.class).to eq(PIntegerType)
       end
 
       it 'when empty infers a type that answers true to is_the_empty_hash?' do
@@ -374,110 +392,132 @@ describe 'The type calculator' do
       end
 
       it 'when empty is not assignable to a PHashType with from size > 0' do
-        expect(calculator.assignable?(constrained_t(hash_t(string_t,string_t), 1, 1), calculator.infer({}))).to eq(false)
+        expect(calculator.assignable?(hash_t(string_t,string_t,range_t(1, 1)), calculator.infer({}))).to eq(false)
       end
 
       context 'using infer_set' do
         it "with 'first' and 'second' keys translates to PStructType[{first=>value,second=>value}]" do
           t = calculator.infer_set({'first' => 1, 'second' => 2})
-          expect(t.class).to eq(Puppet::Pops::Types::PStructType)
+          expect(t.class).to eq(PStructType)
           expect(t.elements.size).to eq(2)
           expect(t.elements.map { |e| e.name }.sort).to eq(['first', 'second'])
         end
 
         it 'with string keys and string and array values translates to PStructType[{key1=>PStringType,key2=>PTupleType}]' do
           t = calculator.infer_set({ 'mode' => 'read', 'path' => ['foo', 'fee' ] })
-          expect(t.class).to eq(Puppet::Pops::Types::PStructType)
+          expect(t.class).to eq(PStructType)
           expect(t.elements.size).to eq(2)
-          els = t.elements.map { |e| e.type }.sort {|a,b| a.to_s <=> b.to_s }
-          expect(els[0].class).to eq(Puppet::Pops::Types::PStringType)
-          expect(els[1].class).to eq(Puppet::Pops::Types::PTupleType)
+          els = t.elements.map { |e| e.value_type }.sort {|a,b| a.to_s <=> b.to_s }
+          expect(els[0].class).to eq(PStringType)
+          expect(els[1].class).to eq(PTupleType)
         end
 
         it 'with mixed string and non-string keys translates to PHashType' do
           t = calculator.infer_set({ 1 => 'first', 'second' => 'second' })
-          expect(t.class).to eq(Puppet::Pops::Types::PHashType)
+          expect(t.class).to eq(PHashType)
         end
 
         it 'with empty string keys translates to PHashType' do
           t = calculator.infer_set({ '' => 'first', 'second' => 'second' })
-          expect(t.class).to eq(Puppet::Pops::Types::PHashType)
+          expect(t.class).to eq(PHashType)
         end
       end
     end
   end
 
   context 'patterns' do
-    it "constructs a PPatternType" do
+    it 'constructs a PPatternType' do
       t = pattern_t('a(b)c')
-      expect(t.class).to eq(Puppet::Pops::Types::PPatternType)
+      expect(t.class).to eq(PPatternType)
       expect(t.patterns.size).to eq(1)
-      expect(t.patterns[0].class).to eq(Puppet::Pops::Types::PRegexpType)
+      expect(t.patterns[0].class).to eq(PRegexpType)
       expect(t.patterns[0].pattern).to eq('a(b)c')
       expect(t.patterns[0].regexp.match('abc')[1]).to eq('b')
     end
 
-    it "constructs a PStringType with multiple strings" do
-      t = string_t('a', 'b', 'c', 'abc')
-      expect(t.values).to eq(['a', 'b', 'c', 'abc'])
+    it 'constructs a PEnumType with multiple strings' do
+      t = enum_t('a', 'b', 'c', 'abc')
+      expect(t.values).to eq(['a', 'b', 'c', 'abc'].sort)
     end
   end
 
   # Deal with cases not covered by computing common type
   context 'when computing common type' do
     it 'computes given resource type commonality' do
-      r1 = Puppet::Pops::Types::PResourceType.new()
-      r1.type_name = 'File'
-      r2 = Puppet::Pops::Types::PResourceType.new()
-      r2.type_name = 'File'
-      expect(calculator.string(calculator.common_type(r1, r2))).to eq("File")
+      r1 = PResourceType.new('File', nil)
+      r2 = PResourceType.new('File', nil)
+      expect(calculator.common_type(r1, r2).to_s).to eq('File')
+
 
-      r2 = Puppet::Pops::Types::PResourceType.new()
-      r2.type_name = 'File'
-      r2.title = '/tmp/foo'
-      expect(calculator.string(calculator.common_type(r1, r2))).to eq("File")
+      r2 = PResourceType.new('File', '/tmp/foo')
+      expect(calculator.common_type(r1, r2).to_s).to eq('File')
 
-      r1 = Puppet::Pops::Types::PResourceType.new()
-      r1.type_name = 'File'
-      r1.title = '/tmp/foo'
-      expect(calculator.string(calculator.common_type(r1, r2))).to eq("File['/tmp/foo']")
+      r1 = PResourceType.new('File', '/tmp/foo')
+      expect(calculator.common_type(r1, r2).to_s).to eq("File['/tmp/foo']")
 
-      r1 = Puppet::Pops::Types::PResourceType.new()
-      r1.type_name = 'File'
-      r1.title = '/tmp/bar'
-      expect(calculator.string(calculator.common_type(r1, r2))).to eq("File")
+      r1 = PResourceType.new('File', '/tmp/bar')
+      expect(calculator.common_type(r1, r2).to_s).to eq('File')
 
-      r2 = Puppet::Pops::Types::PResourceType.new()
-      r2.type_name = 'Package'
-      r2.title = 'apache'
-      expect(calculator.string(calculator.common_type(r1, r2))).to eq("Resource")
+      r2 = PResourceType.new('Package', 'apache')
+      expect(calculator.common_type(r1, r2).to_s).to eq('Resource')
     end
 
     it 'computes given hostclass type commonality' do
-      r1 = Puppet::Pops::Types::PHostClassType.new()
-      r1.class_name = 'foo'
-      r2 = Puppet::Pops::Types::PHostClassType.new()
-      r2.class_name = 'foo'
-      expect(calculator.string(calculator.common_type(r1, r2))).to eq("Class[foo]")
+      r1 = PHostClassType.new('foo')
+      r2 = PHostClassType.new('foo')
+      expect(calculator.common_type(r1, r2).to_s).to eq('Class[foo]')
+
+      r2 = PHostClassType.new('bar')
+      expect(calculator.common_type(r1, r2).to_s).to eq('Class')
+
+      r2 = PHostClassType.new(nil)
+      expect(calculator.common_type(r1, r2).to_s).to eq('Class')
+
+      r1 = PHostClassType.new(nil)
+      expect(calculator.common_type(r1, r2).to_s).to eq('Class')
+    end
 
-      r2 = Puppet::Pops::Types::PHostClassType.new()
-      r2.class_name = 'bar'
-      expect(calculator.string(calculator.common_type(r1, r2))).to eq("Class")
+    context 'of strings' do
+      it 'computes commonality' do
+        t1 = string_t('abc')
+        t2 = string_t('xyz')
+        common_t = calculator.common_type(t1,t2)
+        expect(common_t.class).to eq(PEnumType)
+        expect(common_t.values).to eq(['abc', 'xyz'])
+      end
 
-      r2 = Puppet::Pops::Types::PHostClassType.new()
-      expect(calculator.string(calculator.common_type(r1, r2))).to eq("Class")
+      it 'computes common size_type' do
+        t1 = constrained_string_t(range_t(3,6))
+        t2 = constrained_string_t(range_t(2,4))
+        common_t = calculator.common_type(t1,t2)
+        expect(common_t.class).to eq(PStringType)
+        expect(common_t.size_type).to eq(range_t(2,6))
+      end
+
+      it 'computes common size_type to be undef when one of the types has no size_type' do
+        t1 = string_t
+        t2 = constrained_string_t(range_t(2,4))
+        common_t = calculator.common_type(t1,t2)
+        expect(common_t.class).to eq(PStringType)
+        expect(common_t.size_type).to be_nil
+      end
 
-      r1 = Puppet::Pops::Types::PHostClassType.new()
-      expect(calculator.string(calculator.common_type(r1, r2))).to eq("Class")
+      it 'computes values to be empty if the one has empty values' do
+        t1 = string_t('apa')
+        t2 = constrained_string_t(range_t(2,4))
+        common_t = calculator.common_type(t1,t2)
+        expect(common_t.class).to eq(PStringType)
+        expect(common_t.value).to be_nil
+      end
     end
 
     it 'computes pattern commonality' do
       t1 = pattern_t('abc')
       t2 = pattern_t('xyz')
       common_t = calculator.common_type(t1,t2)
-      expect(common_t.class).to eq(Puppet::Pops::Types::PPatternType)
+      expect(common_t.class).to eq(PPatternType)
       expect(common_t.patterns.map { |pr| pr.pattern }).to eq(['abc', 'xyz'])
-      expect(calculator.string(common_t)).to eq("Pattern[/abc/, /xyz/]")
+      expect(common_t.to_s).to eq('Pattern[/abc/, /xyz/]')
     end
 
     it 'computes enum commonality to value set sum' do
@@ -488,131 +528,228 @@ describe 'The type calculator' do
     end
 
     it 'computed variant commonality to type union where added types are not sub-types' do
-      a_t1 = integer_t()
+      a_t1 = integer_t
       a_t2 = enum_t('b')
       v_a = variant_t(a_t1, a_t2)
-      b_t1 = enum_t('a')
-      v_b = variant_t(b_t1)
+      b_t1 = integer_t
+      b_t2 = enum_t('a')
+      v_b = variant_t(b_t1, b_t2)
       common_t = calculator.common_type(v_a, v_b)
-      expect(common_t.class).to eq(Puppet::Pops::Types::PVariantType)
-      expect(Set.new(common_t.types)).to  eq(Set.new([a_t1, a_t2, b_t1]))
+      expect(common_t.class).to eq(PVariantType)
+      expect(Set.new(common_t.types)).to  eq(Set.new([a_t1, a_t2, b_t1, b_t2]))
     end
 
     it 'computed variant commonality to type union where added types are sub-types' do
-      a_t1 = integer_t()
-      a_t2 = string_t()
+      a_t1 = integer_t
+      a_t2 = string_t
       v_a = variant_t(a_t1, a_t2)
-      b_t1 = enum_t('a')
-      v_b = variant_t(b_t1)
+      b_t1 = integer_t
+      b_t2 = enum_t('a')
+      v_b = variant_t(b_t1, b_t2)
       common_t = calculator.common_type(v_a, v_b)
-      expect(common_t.class).to eq(Puppet::Pops::Types::PVariantType)
+      expect(common_t.class).to eq(PVariantType)
       expect(Set.new(common_t.types)).to  eq(Set.new([a_t1, a_t2]))
     end
 
-    context "of callables" do
+    context 'of callables' do
       it 'incompatible instances => generic callable' do
         t1 = callable_t(String)
         t2 = callable_t(Integer)
         common_t = calculator.common_type(t1, t2)
-        expect(common_t.class).to be(Puppet::Pops::Types::PCallableType)
+        expect(common_t.class).to be(PCallableType)
         expect(common_t.param_types).to be_nil
         expect(common_t.block_type).to be_nil
       end
 
       it 'compatible instances => the most specific' do
         t1 = callable_t(String)
-        scalar_t = Puppet::Pops::Types::PScalarType.new
+        scalar_t = PScalarType.new
         t2 = callable_t(scalar_t)
         common_t = calculator.common_type(t1, t2)
-        expect(common_t.class).to be(Puppet::Pops::Types::PCallableType)
-        expect(common_t.param_types.class).to be(Puppet::Pops::Types::PTupleType)
+        expect(common_t.class).to be(PCallableType)
+        expect(common_t.param_types.class).to be(PTupleType)
         expect(common_t.param_types.types).to eql([string_t])
         expect(common_t.block_type).to be_nil
       end
 
       it 'block_type is included in the check (incompatible block)' do
-        t1 = with_block_t(callable_t(String), String)
-        t2 = with_block_t(callable_t(String), Integer)
+        b1 = callable_t(String)
+        b2 = callable_t(Integer)
+        t1 = callable_t(String, b1)
+        t2 = callable_t(String, b2)
         common_t = calculator.common_type(t1, t2)
-        expect(common_t.class).to be(Puppet::Pops::Types::PCallableType)
+        expect(common_t.class).to be(PCallableType)
         expect(common_t.param_types).to be_nil
         expect(common_t.block_type).to be_nil
       end
 
       it 'block_type is included in the check (compatible block)' do
-        t1 = with_block_t(callable_t(String), String)
-        scalar_t = Puppet::Pops::Types::PScalarType.new
-        t2 = with_block_t(callable_t(String), scalar_t)
+        b1 = callable_t(String)
+        t1 = callable_t(String, b1)
+        scalar_t = PScalarType::DEFAULT
+        b2 = callable_t(scalar_t)
+        t2 = callable_t(String, b2)
         common_t = calculator.common_type(t1, t2)
-        expect(common_t.param_types.class).to be(Puppet::Pops::Types::PTupleType)
+        expect(common_t.param_types.class).to be(PTupleType)
         expect(common_t.block_type).to eql(callable_t(scalar_t))
       end
+
+      it 'return_type is included in the check (incompatible return_type)' do
+        t1 = callable_t([String], String)
+        t2 = callable_t([String], Integer)
+        common_t = calculator.common_type(t1, t2)
+        expect(common_t.class).to be(PCallableType)
+        expect(common_t.param_types).to be_nil
+        expect(common_t.return_type).to be_nil
+      end
+
+      it 'return_type is included in the check (compatible return_type)' do
+        t1 = callable_t([String], Numeric)
+        t2 = callable_t([String], Integer)
+        common_t = calculator.common_type(t1, t2)
+        expect(common_t.class).to be(PCallableType)
+        expect(common_t.param_types).to be_a(PTupleType)
+        expect(common_t.return_type).to eql(PNumericType::DEFAULT)
+      end
     end
   end
 
   context 'computes assignability' do
-    include_context "types_setup"
+    include_context 'types_setup'
+
+    it 'such that all types are assignable to themselves' do
+      all_types.each do |tc|
+        t = tc::DEFAULT
+        expect(t).to be_assignable_to(t)
+      end
+    end
 
     context 'for Unit, such that' do
       it 'all types are assignable to Unit' do
-        t = Puppet::Pops::Types::PUnitType.new()
-        all_types.each { |t2| expect(t2.new).to be_assignable_to(t) }
+        t = PUnitType::DEFAULT
+        all_types.each { |t2| expect(t2::DEFAULT).to be_assignable_to(t) }
       end
 
       it 'Unit is assignable to all other types' do
-        t = Puppet::Pops::Types::PUnitType.new()
-        all_types.each { |t2| expect(t).to be_assignable_to(t2.new) }
+        t = PUnitType::DEFAULT
+        all_types.each { |t2| expect(t).to be_assignable_to(t2::DEFAULT) }
       end
 
       it 'Unit is assignable to Unit' do
-        t = Puppet::Pops::Types::PUnitType.new()
-        t2 = Puppet::Pops::Types::PUnitType.new()
+        t = PUnitType::DEFAULT
+        t2 = PUnitType::DEFAULT
         expect(t).to be_assignable_to(t2)
       end
     end
 
-    context "for Any, such that" do
+    context 'for Any, such that' do
       it 'all types are assignable to Any' do
-        t = Puppet::Pops::Types::PAnyType.new()
-        all_types.each { |t2| expect(t2.new).to be_assignable_to(t) }
+        t = PAnyType::DEFAULT
+        all_types.each { |t2| expect(t2::DEFAULT).to be_assignable_to(t) }
+      end
+
+      it 'Any is not assignable to anything but Any and Optional (implied Optional[Any])' do
+        tested_types = all_types() - [PAnyType, POptionalType]
+        t = PAnyType::DEFAULT
+        tested_types.each { |t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
+      end
+    end
+
+    context "for NotUndef, such that" do
+      it 'all types except types assignable from Undef are assignable to NotUndef' do
+        t = not_undef_t
+        tc = TypeCalculator.singleton
+        undef_t = PUndefType::DEFAULT
+        all_types.each do |c|
+          t2 = c::DEFAULT
+          if tc.assignable?(t2, undef_t)
+            expect(t2).not_to be_assignable_to(t)
+          else
+            expect(t2).to be_assignable_to(t)
+          end
+        end
+      end
+
+      it 'type NotUndef[T] is assignable from T unless T is assignable from Undef ' do
+        tc = TypeCalculator.singleton
+        undef_t = PUndefType::DEFAULT
+        all_types().select do |c|
+          t2 = c::DEFAULT
+          not_undef_t = not_undef_t(t2)
+          if tc.assignable?(t2, undef_t)
+            expect(t2).not_to be_assignable_to(not_undef_t)
+          else
+            expect(t2).to be_assignable_to(not_undef_t)
+          end
+        end
       end
 
-      it 'Any is not assignable to anything but Any' do
-        tested_types = all_types() - [Puppet::Pops::Types::PAnyType]
-        t = Puppet::Pops::Types::PAnyType.new()
-        tested_types.each { |t2| expect(t).not_to be_assignable_to(t2.new) }
+      it 'type T is assignable from NotUndef[T] unless T is assignable from Undef' do
+        tc = TypeCalculator.singleton
+        undef_t = PUndefType::DEFAULT
+        all_types().select do |c|
+          t2 = c::DEFAULT
+          not_undef_t = not_undef_t(t2)
+          unless tc.assignable?(t2, undef_t)
+            expect(not_undef_t).to be_assignable_to(t2)
+          end
+        end
       end
     end
 
-    context "for Data, such that" do
+    context "for TypeReference, such that" do
+      it 'no other type is assignable' do
+        t = PTypeReferenceType::DEFAULT
+        all_instances = (all_types - [
+          PTypeReferenceType, # Avoid comparison with t
+          PVariantType,   # DEFAULT contains no variants, so assignability is never tested and always true
+          PTypeAliasType      # DEFAULT resolves to PTypeReferenceType::DEFAULT, i.e. t
+        ]).map {|c| c::DEFAULT }
+
+        # Add a non-empty variant
+        all_instances << variant_t(PAnyType::DEFAULT, PUnitType::DEFAULT)
+        # Add a type alias that doesn't resolve to 't'
+        all_instances << type_alias_t('MyInt', 'Integer').resolve(TypeParser.singleton, nil)
+
+        all_instances.each { |i| expect(i).not_to be_assignable_to(t) }
+      end
+
+      it 'a TypeReference to the exact same type is assignable' do
+        expect(type_reference_t('Integer[0,10]')).to be_assignable_to(type_reference_t('Integer[0,10]'))
+      end
+
+      it 'a TypeReference to the different type is not assignable' do
+        expect(type_reference_t('String')).not_to be_assignable_to(type_reference_t('Integer'))
+      end
+
+      it 'a TypeReference to the different type is not assignable even if the referenced type is' do
+        expect(type_reference_t('Integer[1,2]')).not_to be_assignable_to(type_reference_t('Integer[0,3]'))
+      end
+    end
+
+    context 'for Data, such that' do
       it 'all scalars + array and hash are assignable to Data' do
-        t = Puppet::Pops::Types::PDataType.new()
+        t = PDataType::DEFAULT
         data_compatible_types.each { |t2|
           expect(type_from_class(t2)).to be_assignable_to(t)
         }
       end
 
-      it 'a Variant of scalar, hash, or array is assignable to Data' do
-        t = Puppet::Pops::Types::PDataType.new()
-        data_compatible_types.each { |t2| expect(variant_t(type_from_class(t2))).to be_assignable_to(t) }
+      it 'a scalar, hash, or array is assignable to Data' do
+        t = PDataType::DEFAULT
+        data_compatible_types.each { |t2| expect(type_from_class(t2)).to be_assignable_to(t) }
       end
 
       it 'Data is not assignable to any of its subtypes' do
-        t = Puppet::Pops::Types::PDataType.new()
-        types_to_test = data_compatible_types- [Puppet::Pops::Types::PDataType]
+        t = PDataType::DEFAULT
+        types_to_test = data_compatible_types- [PDataType]
         types_to_test.each {|t2| expect(t).not_to be_assignable_to(type_from_class(t2)) }
       end
 
-      it 'Data is not assignable to a Variant of Data subtype' do
-        t = Puppet::Pops::Types::PDataType.new()
-        types_to_test = data_compatible_types- [Puppet::Pops::Types::PDataType]
-        types_to_test.each { |t2| expect(t).not_to be_assignable_to(variant_t(type_from_class(t2))) }
-      end
-
       it 'Data is not assignable to any disjunct type' do
-        tested_types = all_types - [Puppet::Pops::Types::PAnyType, Puppet::Pops::Types::PDataType] - scalar_types
-        t = Puppet::Pops::Types::PDataType.new()
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+        tested_types = all_types - [PAnyType, POptionalType, PDataType] - scalar_types
+        t = PDataType::DEFAULT
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
     end
 
@@ -634,102 +771,132 @@ describe 'The type calculator' do
       end
     end
 
-    context "for Scalar, such that" do
-      it "all scalars are assignable to Scalar" do
-        t = Puppet::Pops::Types::PScalarType.new()
-        scalar_types.each {|t2| expect(t2.new).to be_assignable_to(t) }
+    context 'for Scalar, such that' do
+      it 'all scalars are assignable to Scalar' do
+        t = PScalarType::DEFAULT
+        scalar_types.each {|t2| expect(t2::DEFAULT).to be_assignable_to(t) }
       end
 
       it 'Scalar is not assignable to any of its subtypes' do
-        t = Puppet::Pops::Types::PScalarType.new()
-        types_to_test = scalar_types - [Puppet::Pops::Types::PScalarType]
-        types_to_test.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+        t = PScalarType::DEFAULT
+        types_to_test = scalar_types - [PScalarType]
+        types_to_test.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
 
       it 'Scalar is not assignable to any disjunct type' do
-        tested_types = all_types - [Puppet::Pops::Types::PAnyType, Puppet::Pops::Types::PDataType] - scalar_types
-        t = Puppet::Pops::Types::PScalarType.new()
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+        tested_types = all_types - [PAnyType, POptionalType, PNotUndefType, PDataType] - scalar_types
+        t = PScalarType::DEFAULT
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
     end
 
-    context "for Numeric, such that" do
-      it "all numerics are assignable to Numeric" do
-        t = Puppet::Pops::Types::PNumericType.new()
-        numeric_types.each {|t2| expect(t2.new).to be_assignable_to(t) }
+    context 'for Numeric, such that' do
+      it 'all numerics are assignable to Numeric' do
+        t = PNumericType::DEFAULT
+        numeric_types.each {|t2| expect(t2::DEFAULT).to be_assignable_to(t) }
       end
 
       it 'Numeric is not assignable to any of its subtypes' do
-        t = Puppet::Pops::Types::PNumericType.new()
-        types_to_test = numeric_types - [Puppet::Pops::Types::PNumericType]
-        types_to_test.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+        t = PNumericType::DEFAULT
+        types_to_test = numeric_types - [PNumericType]
+        types_to_test.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
 
       it 'Numeric is not assignable to any disjunct type' do
         tested_types = all_types - [
-          Puppet::Pops::Types::PAnyType,
-          Puppet::Pops::Types::PDataType,
-          Puppet::Pops::Types::PScalarType,
+          PAnyType,
+          POptionalType,
+          PNotUndefType,
+          PDataType,
+          PScalarType,
           ] - numeric_types
-        t = Puppet::Pops::Types::PNumericType.new()
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+        t = PNumericType::DEFAULT
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
     end
 
-    context "for Collection, such that" do
-      it "all collections are assignable to Collection" do
-        t = Puppet::Pops::Types::PCollectionType.new()
-        collection_types.each {|t2| expect(t2.new).to be_assignable_to(t) }
+    context 'for Collection, such that' do
+      it 'all collections are assignable to Collection' do
+        t = PCollectionType::DEFAULT
+        collection_types.each {|t2| expect(t2::DEFAULT).to be_assignable_to(t) }
       end
 
       it 'Collection is not assignable to any of its subtypes' do
-        t = Puppet::Pops::Types::PCollectionType.new()
-        types_to_test = collection_types - [Puppet::Pops::Types::PCollectionType]
-        types_to_test.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+        t = PCollectionType::DEFAULT
+        types_to_test = collection_types - [PCollectionType]
+        types_to_test.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
 
       it 'Collection is not assignable to any disjunct type' do
-        tested_types = all_types - [Puppet::Pops::Types::PAnyType] - collection_types
-        t = Puppet::Pops::Types::PCollectionType.new()
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+        tested_types = all_types - [
+          PAnyType,
+          POptionalType,
+          PNotUndefType,
+          PIterableType] - collection_types
+        t = PCollectionType::DEFAULT
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
     end
 
-    context "for Array, such that" do
-      it "Array is not assignable to non Array based Collection type" do
-        t = Puppet::Pops::Types::PArrayType.new()
+    context 'for Array, such that' do
+      it 'Array is not assignable to non Array based Collection type' do
+        t = PArrayType::DEFAULT
         tested_types = collection_types - [
-          Puppet::Pops::Types::PCollectionType,
-          Puppet::Pops::Types::PArrayType,
-          Puppet::Pops::Types::PTupleType]
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+          PCollectionType,
+          PNotUndefType,
+          PArrayType,
+          PTupleType]
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
 
       it 'Array is not assignable to any disjunct type' do
         tested_types = all_types - [
-          Puppet::Pops::Types::PAnyType,
-          Puppet::Pops::Types::PDataType] - collection_types
-        t = Puppet::Pops::Types::PArrayType.new()
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+          PAnyType,
+          POptionalType,
+          PNotUndefType,
+          PIterableType,
+          PDataType] - collection_types
+        t = PArrayType::DEFAULT
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
+      end
+
+      it 'Empty Array is assignable to an array that accepts 0 entries' do
+        expect(empty_array_t).to be_assignable_to(array_t(string_t))
+        expect(empty_array_t).to be_assignable_to(array_t(integer_t))
+      end
+
+      it 'A Tuple is assignable to an array' do
+        expect(tuple_t(String)).to be_assignable_to(array_t(String))
+      end
+
+      it 'A Tuple with <n> elements is assignable to an array with min size <n>' do
+        expect(tuple_t(String,String)).to be_assignable_to(array_t(String, range_t(2, :default)))
+      end
+
+      it 'A Tuple with <n> elements where the last 2 are optional is assignable to an array with size <n> - 2' do
+        expect(constrained_tuple_t(range_t(2, :default), String,String,String,String)).to be_assignable_to(array_t(String, range_t(2, :default)))
       end
     end
 
-    context "for Hash, such that" do
-      it "Hash is not assignable to any other Collection type" do
-        t = Puppet::Pops::Types::PHashType.new()
+    context 'for Hash, such that' do
+      it 'Hash is not assignable to any other Collection type' do
+        t = PHashType::DEFAULT
         tested_types = collection_types - [
-          Puppet::Pops::Types::PCollectionType,
-          Puppet::Pops::Types::PStructType,
-          Puppet::Pops::Types::PHashType]
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+          PCollectionType,
+          PStructType,
+          PHashType]
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
 
       it 'Hash is not assignable to any disjunct type' do
         tested_types = all_types - [
-          Puppet::Pops::Types::PAnyType,
-          Puppet::Pops::Types::PDataType] - collection_types
-        t = Puppet::Pops::Types::PHashType.new()
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+          PAnyType,
+          POptionalType,
+          PNotUndefType,
+          PIterableType,
+          PDataType] - collection_types
+        t = PHashType::DEFAULT
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
 
       it 'Struct is assignable to Hash with Pattern that matches all keys' do
@@ -749,68 +916,187 @@ describe 'The type calculator' do
       end
     end
 
-    context "for Tuple, such that" do
-      it "Tuple is not assignable to any other non Array based Collection type" do
-        t = Puppet::Pops::Types::PTupleType.new()
+    context 'for Timespan such that' do
+      it 'Timespan is assignable to less constrained Timespan' do
+        t1 = PTimespanType.new('00:00:10', '00:00:20')
+        t2 = PTimespanType.new('00:00:11', '00:00:19')
+        expect(t2).to be_assignable_to(t1)
+      end
+
+      it 'Timespan is not assignable to more constrained Timespan' do
+        t1 = PTimespanType.new('00:00:10', '00:00:20')
+        t2 = PTimespanType.new('00:00:11', '00:00:19')
+        expect(t1).not_to be_assignable_to(t2)
+      end
+    end
+
+    context 'for Timestamp such that' do
+      it 'Timestamp is assignable to less constrained Timestamp' do
+        t1 = PTimestampType.new('2016-01-01', '2016-12-31')
+        t2 = PTimestampType.new('2016-02-01', '2016-11-30')
+        expect(t2).to be_assignable_to(t1)
+      end
+
+      it 'Timestamp is not assignable to more constrained Timestamp' do
+        t1 = PTimestampType.new('2016-01-01', '2016-12-31')
+        t2 = PTimestampType.new('2016-02-01', '2016-11-30')
+        expect(t1).not_to be_assignable_to(t2)
+      end
+    end
+
+    context 'for Tuple, such that' do
+      it 'Tuple is not assignable to any other non Array based Collection type' do
+        t = PTupleType::DEFAULT
         tested_types = collection_types - [
-          Puppet::Pops::Types::PCollectionType,
-          Puppet::Pops::Types::PTupleType,
-          Puppet::Pops::Types::PArrayType]
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+          PCollectionType,
+          PTupleType,
+          PArrayType]
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
+      end
+
+      it 'A tuple with parameters is assignable to the default Tuple' do
+        t = PTupleType::DEFAULT
+        t2 = PTupleType.new([PStringType::DEFAULT])
+        expect(t2).to be_assignable_to(t)
       end
 
       it 'Tuple is not assignable to any disjunct type' do
         tested_types = all_types - [
-          Puppet::Pops::Types::PAnyType,
-          Puppet::Pops::Types::PDataType] - collection_types
-        t = Puppet::Pops::Types::PTupleType.new()
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+          PAnyType,
+          POptionalType,
+          PNotUndefType,
+          PIterableType,
+          PDataType] - collection_types
+        t = PTupleType::DEFAULT
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
     end
 
-    context "for Struct, such that" do
-      it "Struct is not assignable to any other non Hashed based Collection type" do
-        t = Puppet::Pops::Types::PStructType.new()
+    context 'for Struct, such that' do
+      it 'Struct is not assignable to any other non Hashed based Collection type' do
+        t = PStructType::DEFAULT
         tested_types = collection_types - [
-          Puppet::Pops::Types::PCollectionType,
-          Puppet::Pops::Types::PStructType,
-          Puppet::Pops::Types::PHashType]
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+          PCollectionType,
+          PStructType,
+          PHashType]
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
       end
 
       it 'Struct is not assignable to any disjunct type' do
         tested_types = all_types - [
-          Puppet::Pops::Types::PAnyType,
-          Puppet::Pops::Types::PDataType] - collection_types
-        t = Puppet::Pops::Types::PStructType.new()
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+          PAnyType,
+          POptionalType,
+          PNotUndefType,
+          PIterableType,
+          PDataType] - collection_types
+        t = PStructType::DEFAULT
+        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2::DEFAULT) }
+      end
+
+      it 'Default key optionality is controlled by value assignability to undef' do
+        t1 = struct_t({'member' => string_t})
+        expect(t1.elements[0].key_type).to eq(string_t('member'))
+        t1 = struct_t({'member' => object_t})
+        expect(t1.elements[0].key_type).to eq(optional_t(string_t('member')))
+      end
+
+      it "NotUndef['key'] becomes String['key'] (since its implied that String is required)" do
+        t1 = struct_t({not_undef_t('member') => string_t})
+        expect(t1.elements[0].key_type).to eq(string_t('member'))
+      end
+
+      it "Optional['key'] becomes Optional[String['key']]" do
+        t1 = struct_t({optional_t('member') => string_t})
+        expect(t1.elements[0].key_type).to eq(optional_t(string_t('member')))
+      end
+
+      it 'Optional members are not required' do
+        t1 = struct_t({optional_t('optional_member') => string_t, not_undef_t('other_member') => string_t})
+        t2 = struct_t({not_undef_t('other_member') => string_t})
+        expect(t2).to be_assignable_to(t1)
+      end
+
+      it 'Required members not optional even when value is' do
+        t1 = struct_t({not_undef_t('required_member') => object_t, not_undef_t('other_member') => string_t})
+        t2 = struct_t({not_undef_t('other_member') => string_t})
+        expect(t2).not_to be_assignable_to(t1)
+      end
+
+      it 'A hash of string is not assignable to struct with integer value' do
+        t1 = struct_t({'foo' => integer_t, 'bar' => string_t})
+        t2 = hash_t(string_t, string_t, range_t(2, 2))
+        expect(t1.assignable?(t2)).to eql(false)
+      end
+
+      it 'A hash of with integer key is not assignable to struct with string key' do
+        t1 = struct_t({'foo' => string_t, 'bar' => string_t})
+        t2 = hash_t(integer_t, string_t, range_t(2, 2))
+        expect(t1.assignable?(t2)).to eql(false)
       end
     end
 
-    context "for Callable, such that" do
-      it "Callable is not assignable to any disjunct type" do
-        t = Puppet::Pops::Types::PCallableType.new()
+    context 'for Callable, such that' do
+      it 'Callable is not assignable to any disjunct type' do
+        t = PCallableType::DEFAULT
         tested_types = all_types - [
-          Puppet::Pops::Types::PCallableType,
-          Puppet::Pops::Types::PAnyType]
-        tested_types.each {|t2| expect(t).not_to be_assignable_to(t2.new) }
+          PCallableType,
+          PAnyType,
+          POptionalType,
+          PNotUndefType]
+        tested_types.each {|t2| expect(t).to_not be_assignable_to(t2::DEFAULT) }
+      end
+
+      it 'a callable with parameter is assignable to the default callable' do
+        expect(callable_t(string_t)).to be_assignable_to(PCallableType::DEFAULT)
+      end
+
+      it 'the default callable is not assignable to a callable with parameter' do
+        expect(PCallableType::DEFAULT).not_to be_assignable_to(callable_t(string_t))
+      end
+
+      it 'a callable with a return type is assignable to the default callable' do
+        expect(callable_t([], string_t)).to be_assignable_to(PCallableType::DEFAULT)
+      end
+
+      it 'the default callable is not assignable to a callable with a return type' do
+        expect(PCallableType::DEFAULT).not_to be_assignable_to(callable_t([],string_t))
+      end
+
+      it 'a callable with a return type Any is assignable to the default callable' do
+        expect(callable_t([], object_t)).to be_assignable_to(PCallableType::DEFAULT)
+      end
+
+      it 'a callable with a return type Any is equal to a callable with the same parameters and no return type' do
+        expect(callable_t([string_t], object_t)).to eql(callable_t(string_t))
+      end
+
+      it 'a callable with a return type different than Any is not equal to a callable with the same parameters and no return type' do
+        expect(callable_t([string_t], string_t)).not_to eql(callable_t(string_t))
+      end
+
+      it 'a callable with a return type is assignable from another callable with an assignable return type' do
+        expect(callable_t([], string_t)).to be_assignable_to(callable_t([], PScalarType::DEFAULT))
+      end
+
+      it 'a callable with a return type is not assignable from another callable unless the return type is assignable' do
+        expect(callable_t([], string_t)).not_to be_assignable_to(callable_t([], integer_t))
       end
     end
 
     it 'should recognize mapped ruby types' do
-      { Integer    => Puppet::Pops::Types::PIntegerType.new,
-        Fixnum     => Puppet::Pops::Types::PIntegerType.new,
-        Bignum     => Puppet::Pops::Types::PIntegerType.new,
-        Float      => Puppet::Pops::Types::PFloatType.new,
-        Numeric    => Puppet::Pops::Types::PNumericType.new,
-        NilClass   => Puppet::Pops::Types::PUndefType.new,
-        TrueClass  => Puppet::Pops::Types::PBooleanType.new,
-        FalseClass => Puppet::Pops::Types::PBooleanType.new,
-        String     => Puppet::Pops::Types::PStringType.new,
-        Regexp     => Puppet::Pops::Types::PRegexpType.new,
-        Regexp     => Puppet::Pops::Types::PRegexpType.new,
-        Array      => Puppet::Pops::Types::TypeFactory.array_of_data(),
-        Hash       => Puppet::Pops::Types::TypeFactory.hash_of_data()
+      { Integer    => PIntegerType::DEFAULT,
+        Fixnum     => PIntegerType::DEFAULT,
+        Bignum     => PIntegerType::DEFAULT,
+        Float      => PFloatType::DEFAULT,
+        Numeric    => PNumericType::DEFAULT,
+        NilClass   => PUndefType::DEFAULT,
+        TrueClass  => PBooleanType::DEFAULT,
+        FalseClass => PBooleanType::DEFAULT,
+        String     => PStringType::DEFAULT,
+        Regexp     => PRegexpType::DEFAULT,
+        Regexp     => PRegexpType::DEFAULT,
+        Array      => TypeFactory.array_of_data,
+        Hash       => TypeFactory.hash_of_data
       }.each do |ruby_type, puppet_type |
           expect(ruby_type).to be_assignable_to(puppet_type)
       end
@@ -821,35 +1107,18 @@ describe 'The type calculator' do
         expect(calculator.assignable?(range_t(2,5), range_t(2,5))).to eq(true)
       end
 
-      it 'should accept an equal reverse range' do
-        expect(calculator.assignable?(range_t(2,5), range_t(5,2))).to eq(true)
-      end
-
       it 'should accept a narrower range' do
         expect(calculator.assignable?(range_t(2,10), range_t(3,5))).to eq(true)
       end
 
-      it 'should accept a narrower reverse range' do
-        expect(calculator.assignable?(range_t(2,10), range_t(5,3))).to eq(true)
-      end
-
       it 'should reject a wider range' do
         expect(calculator.assignable?(range_t(3,5), range_t(2,10))).to eq(false)
       end
 
-      it 'should reject a wider reverse range' do
-        expect(calculator.assignable?(range_t(3,5), range_t(10,2))).to eq(false)
-      end
-
       it 'should reject a partially overlapping range' do
         expect(calculator.assignable?(range_t(3,5), range_t(2,4))).to eq(false)
         expect(calculator.assignable?(range_t(3,5), range_t(4,6))).to eq(false)
       end
-
-      it 'should reject a partially overlapping reverse range' do
-        expect(calculator.assignable?(range_t(3,5), range_t(4,2))).to eq(false)
-        expect(calculator.assignable?(range_t(3,5), range_t(6,4))).to eq(false)
-      end
     end
 
     context 'when dealing with patterns' do
@@ -885,7 +1154,7 @@ describe 'The type calculator' do
 
       it 'should accept multiple strings if they all match any patterns' do
         p_t = pattern_t('X', 'Y', 'abc')
-        p_s = string_t('Xa', 'aY', 'abc')
+        p_s = enum_t('Xa', 'aY', 'abc')
         expect(calculator.assignable?(p_t, p_s)).to eq(true)
       end
 
@@ -897,7 +1166,7 @@ describe 'The type calculator' do
 
       it 'should reject multiple strings if not all match any patterns' do
         p_t = pattern_t('abc', 'ab', 'c', 'q')
-        p_s = string_t('X', 'Y', 'Z')
+        p_s = enum_t('X', 'Y', 'Z')
         expect(calculator.assignable?(p_t, p_s)).to eq(false)
       end
 
@@ -913,18 +1182,18 @@ describe 'The type calculator' do
       end
 
       it 'pattern representing all patterns should accept any pattern' do
-        expect(calculator.assignable?(pattern_t(), pattern_t('a'))).to eq(true)
-        expect(calculator.assignable?(pattern_t(), pattern_t())).to eq(true)
+        expect(calculator.assignable?(pattern_t, pattern_t('a'))).to eq(true)
+        expect(calculator.assignable?(pattern_t, pattern_t)).to eq(true)
       end
 
       it 'pattern representing all patterns should accept any enum' do
-        expect(calculator.assignable?(pattern_t(), enum_t('a'))).to eq(true)
-        expect(calculator.assignable?(pattern_t(), enum_t())).to eq(true)
+        expect(calculator.assignable?(pattern_t, enum_t('a'))).to eq(true)
+        expect(calculator.assignable?(pattern_t, enum_t)).to eq(true)
       end
 
       it 'pattern representing all patterns should accept any string' do
-        expect(calculator.assignable?(pattern_t(), string_t('a'))).to eq(true)
-        expect(calculator.assignable?(pattern_t(), string_t())).to eq(true)
+        expect(calculator.assignable?(pattern_t, string_t('a'))).to eq(true)
+        expect(calculator.assignable?(pattern_t, string_t)).to eq(true)
       end
 
     end
@@ -943,8 +1212,8 @@ describe 'The type calculator' do
       end
 
       it 'non parameterized enum accepts any other enum but not the reverse' do
-        expect(calculator.assignable?(enum_t(), enum_t('a'))).to eq(true)
-        expect(calculator.assignable?(enum_t('a'), enum_t())).to eq(false)
+        expect(calculator.assignable?(enum_t, enum_t('a'))).to eq(true)
+        expect(calculator.assignable?(enum_t('a'), enum_t)).to eq(false)
       end
 
       it 'enum should accept a variant where all variants are acceptable' do
@@ -955,54 +1224,53 @@ describe 'The type calculator' do
 
     context 'when dealing with string and enum combinations' do
       it 'should accept assigning any enum to unrestricted string' do
-        expect(calculator.assignable?(string_t(), enum_t('blue'))).to eq(true)
-        expect(calculator.assignable?(string_t(), enum_t('blue', 'red'))).to eq(true)
+        expect(calculator.assignable?(string_t, enum_t('blue'))).to eq(true)
+        expect(calculator.assignable?(string_t, enum_t('blue', 'red'))).to eq(true)
       end
 
       it 'should not accept assigning longer enum value to size restricted string' do
-        expect(calculator.assignable?(constrained_t(string_t(),2,2), enum_t('a','blue'))).to eq(false)
+        expect(calculator.assignable?(constrained_string_t(range_t(2,2)), enum_t('a','blue'))).to eq(false)
       end
 
       it 'should accept assigning any string to empty enum' do
-        expect(calculator.assignable?(enum_t(), string_t())).to eq(true)
+        expect(calculator.assignable?(enum_t, string_t)).to eq(true)
       end
 
       it 'should accept assigning empty enum to any string' do
-        expect(calculator.assignable?(string_t(), enum_t())).to eq(true)
+        expect(calculator.assignable?(string_t, enum_t)).to eq(true)
       end
 
       it 'should not accept assigning empty enum to size constrained string' do
-        expect(calculator.assignable?(constrained_t(string_t(),2,2), enum_t())).to eq(false)
+        expect(calculator.assignable?(constrained_string_t(range_t(2,2)), enum_t)).to eq(false)
       end
     end
 
     context 'when dealing with string/pattern/enum combinations' do
       it 'any string is equal to any enum is equal to any pattern' do
-        expect(calculator.assignable?(string_t(), enum_t())).to eq(true)
-        expect(calculator.assignable?(string_t(), pattern_t())).to eq(true)
-        expect(calculator.assignable?(enum_t(), string_t())).to eq(true)
-        expect(calculator.assignable?(enum_t(), pattern_t())).to eq(true)
-        expect(calculator.assignable?(pattern_t(), string_t())).to eq(true)
-        expect(calculator.assignable?(pattern_t(), enum_t())).to eq(true)
+        expect(calculator.assignable?(string_t, enum_t)).to eq(true)
+        expect(calculator.assignable?(string_t, pattern_t)).to eq(true)
+        expect(calculator.assignable?(enum_t, string_t)).to eq(true)
+        expect(calculator.assignable?(enum_t, pattern_t)).to eq(true)
+        expect(calculator.assignable?(pattern_t, string_t)).to eq(true)
+        expect(calculator.assignable?(pattern_t, enum_t)).to eq(true)
       end
     end
 
     context 'when dealing with tuples' do
       it 'matches empty tuples' do
-        tuple1 = tuple_t()
-        tuple2 = tuple_t()
+        tuple1 = tuple_t
+        tuple2 = tuple_t
 
         expect(calculator.assignable?(tuple1, tuple2)).to eq(true)
         expect(calculator.assignable?(tuple2, tuple1)).to eq(true)
       end
 
       it 'accepts an empty tuple as assignable to a tuple with a min size of 0' do
-        tuple1 = tuple_t(Object)
-        factory.constrain_size(tuple1, 0, :default)
+        tuple1 = constrained_tuple_t(range_t(0, :default))
         tuple2 = tuple_t()
 
         expect(calculator.assignable?(tuple1, tuple2)).to eq(true)
-        expect(calculator.assignable?(tuple2, tuple1)).to eq(false)
+        expect(calculator.assignable?(tuple2, tuple1)).to eq(true)
       end
 
       it 'should accept matching tuples' do
@@ -1020,62 +1288,51 @@ describe 'The type calculator' do
       end
 
       it 'should accept ranged tuples' do
-        tuple1 = tuple_t(1)
-        factory.constrain_size(tuple1, 5, 5)
+        tuple1 = constrained_tuple_t(range_t(5,5), 1)
         tuple2 = tuple_t(Integer,Integer, Integer, Integer, Integer)
         expect(calculator.assignable?(tuple1, tuple2)).to eq(true)
         expect(calculator.assignable?(tuple2, tuple1)).to eq(true)
       end
 
       it 'should reject ranged tuples when ranges does not match' do
-        tuple1 = tuple_t(1)
-        factory.constrain_size(tuple1, 4, 5)
+        tuple1 = constrained_tuple_t(range_t(4, 5), 1)
         tuple2 = tuple_t(Integer,Integer, Integer, Integer, Integer)
         expect(calculator.assignable?(tuple1, tuple2)).to eq(true)
         expect(calculator.assignable?(tuple2, tuple1)).to eq(false)
       end
 
       it 'should reject ranged tuples when ranges does not match (using infinite upper bound)' do
-        tuple1 = tuple_t(1)
-        factory.constrain_size(tuple1, 4, :default)
+        tuple1 = constrained_tuple_t(range_t(4, :default), 1)
         tuple2 = tuple_t(Integer,Integer, Integer, Integer, Integer)
         expect(calculator.assignable?(tuple1, tuple2)).to eq(true)
         expect(calculator.assignable?(tuple2, tuple1)).to eq(false)
       end
 
       it 'should accept matching tuples with optional entries by repeating last' do
-        tuple1 = tuple_t(1,2)
-        factory.constrain_size(tuple1, 0, :default)
-        tuple2 = tuple_t(Numeric,Numeric)
-        factory.constrain_size(tuple2, 0, :default)
+        tuple1 = constrained_tuple_t(range_t(0, :default), 1,2)
+        tuple2 = constrained_tuple_t(range_t(0, :default), Numeric,Numeric)
         expect(calculator.assignable?(tuple1, tuple2)).to eq(false)
         expect(calculator.assignable?(tuple2, tuple1)).to eq(true)
       end
 
       it 'should accept matching tuples with optional entries' do
-        tuple1 = tuple_t(Integer, Integer, String)
-        factory.constrain_size(tuple1, 1, 3)
-        array2 = factory.constrain_size(array_t(Integer),2,2)
+        tuple1 = constrained_tuple_t(range_t(1, 3), Integer, Integer, String)
+        array2 = array_t(Integer, range_t(2,2))
         expect(calculator.assignable?(tuple1, array2)).to eq(true)
-        factory.constrain_size(tuple1, 3, 3)
+        tuple1 = constrained_tuple_t(range_t(3, 3), tuple1.types)
         expect(calculator.assignable?(tuple1, array2)).to eq(false)
       end
 
       it 'should accept matching array' do
         tuple1 = tuple_t(1,2)
-        array = array_t(Integer)
-        factory.constrain_size(array, 2, 2)
+        array = array_t(Integer, range_t(2, 2))
         expect(calculator.assignable?(tuple1, array)).to eq(true)
         expect(calculator.assignable?(array, tuple1)).to eq(true)
       end
 
       it 'should accept empty array when tuple allows min of 0' do
-        tuple1 = tuple_t(Integer)
-        factory.constrain_size(tuple1, 0, 1)
-
-        array = array_t(Integer)
-        factory.constrain_size(array, 0, 0)
-
+        tuple1 = constrained_tuple_t(range_t(0, 1), Integer)
+        array = array_t(unit_t, range_t(0, 0))
         expect(calculator.assignable?(tuple1, array)).to eq(true)
         expect(calculator.assignable?(array, tuple1)).to eq(false)
       end
@@ -1122,18 +1379,15 @@ describe 'The type calculator' do
 
       it 'should accept matching hash' do
         struct1 = struct_t({'a'=>Integer, 'b'=>Integer})
-        non_empty_string = string_t()
-        non_empty_string.size_type = range_t(1, nil)
-        hsh = hash_t(non_empty_string, Integer)
-        factory.constrain_size(hsh, 2, 2)
+        non_empty_string = constrained_string_t(range_t(1, nil))
+        hsh = hash_t(non_empty_string, Integer, range_t(2,2))
         expect(calculator.assignable?(struct1, hsh)).to eq(true)
         expect(calculator.assignable?(hsh, struct1)).to eq(true)
       end
 
-      it 'should accept empty hash with key_type undef' do
+      it 'should accept empty hash with key_type unit' do
         struct1 = struct_t({'a'=>optional_t(Integer)})
-        hsh = hash_t(undef_t, undef_t)
-        factory.constrain_size(hsh, 0, 0)
+        hsh = hash_t(unit_t, unit_t, range_t(0, 0))
         expect(calculator.assignable?(struct1, hsh)).to eq(true)
       end
     end
@@ -1158,107 +1412,232 @@ describe 'The type calculator' do
       expect(calculator.assignable?(Bar, fooType)).to eq(false)
     end
 
-    it "should allow host class with same name" do
-      hc1 = Puppet::Pops::Types::TypeFactory.host_class('the_name')
-      hc2 = Puppet::Pops::Types::TypeFactory.host_class('the_name')
+    it 'should allow host class with same name' do
+      hc1 = TypeFactory.host_class('the_name')
+      hc2 = TypeFactory.host_class('the_name')
       expect(calculator.assignable?(hc1, hc2)).to eq(true)
     end
 
-    it "should allow host class with name assigned to hostclass without name" do
-      hc1 = Puppet::Pops::Types::TypeFactory.host_class()
-      hc2 = Puppet::Pops::Types::TypeFactory.host_class('the_name')
+    it 'should allow host class with name assigned to hostclass without name' do
+      hc1 = TypeFactory.host_class
+      hc2 = TypeFactory.host_class('the_name')
       expect(calculator.assignable?(hc1, hc2)).to eq(true)
     end
 
-    it "should reject host classes with different names" do
-      hc1 = Puppet::Pops::Types::TypeFactory.host_class('the_name')
-      hc2 = Puppet::Pops::Types::TypeFactory.host_class('another_name')
+    it 'should reject host classes with different names' do
+      hc1 = TypeFactory.host_class('the_name')
+      hc2 = TypeFactory.host_class('another_name')
       expect(calculator.assignable?(hc1, hc2)).to eq(false)
     end
 
-    it "should reject host classes without name assigned to host class with name" do
-      hc1 = Puppet::Pops::Types::TypeFactory.host_class('the_name')
-      hc2 = Puppet::Pops::Types::TypeFactory.host_class()
+    it 'should reject host classes without name assigned to host class with name' do
+      hc1 = TypeFactory.host_class('the_name')
+      hc2 = TypeFactory.host_class
       expect(calculator.assignable?(hc1, hc2)).to eq(false)
     end
 
-    it "should allow resource with same type_name and title" do
-      r1 = Puppet::Pops::Types::TypeFactory.resource('file', 'foo')
-      r2 = Puppet::Pops::Types::TypeFactory.resource('file', 'foo')
+    it 'should allow resource with same type_name and title' do
+      r1 = TypeFactory.resource('file', 'foo')
+      r2 = TypeFactory.resource('file', 'foo')
       expect(calculator.assignable?(r1, r2)).to eq(true)
     end
 
-    it "should allow more specific resource assignment" do
-      r1 = Puppet::Pops::Types::TypeFactory.resource()
-      r2 = Puppet::Pops::Types::TypeFactory.resource('file')
+    it 'should allow more specific resource assignment' do
+      r1 = TypeFactory.resource
+      r2 = TypeFactory.resource('file')
       expect(calculator.assignable?(r1, r2)).to eq(true)
-      r2 = Puppet::Pops::Types::TypeFactory.resource('file', '/tmp/foo')
+      r2 = TypeFactory.resource('file', '/tmp/foo')
       expect(calculator.assignable?(r1, r2)).to eq(true)
-      r1 = Puppet::Pops::Types::TypeFactory.resource('file')
+      r1 = TypeFactory.resource('file')
       expect(calculator.assignable?(r1, r2)).to eq(true)
     end
 
-    it "should reject less specific resource assignment" do
-      r1 = Puppet::Pops::Types::TypeFactory.resource('file', '/tmp/foo')
-      r2 = Puppet::Pops::Types::TypeFactory.resource('file')
+    it 'should reject less specific resource assignment' do
+      r1 = TypeFactory.resource('file', '/tmp/foo')
+      r2 = TypeFactory.resource('file')
       expect(calculator.assignable?(r1, r2)).to eq(false)
-      r2 = Puppet::Pops::Types::TypeFactory.resource()
+      r2 = TypeFactory.resource
       expect(calculator.assignable?(r1, r2)).to eq(false)
     end
 
+    context 'for TypeAlias, such that' do
+      let!(:parser) { TypeParser.singleton }
+
+      it 'it is assignable to the type that it is an alias for' do
+        t = type_alias_t('Alias', 'Integer').resolve(parser, nil)
+        expect(calculator.assignable?(integer_t, t)).to be_truthy
+      end
+
+      it 'the type that it is an alias for is assignable to it' do
+        t = type_alias_t('Alias', 'Integer').resolve(parser, nil)
+        expect(calculator.assignable?(t, integer_t)).to be_truthy
+      end
+
+      it 'a recursive alias can be assignable from a conformant type with any depth' do
+        scope = Object.new
+
+        t = type_alias_t('Tree', 'Hash[String,Variant[String,Tree]]')
+        loader = Object.new
+        loader.expects(:load).with(:type, 'tree').returns t
+
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).with(instance_of(Model::QualifiedReference), scope).at_most_once.returns loader
+
+        t.resolve(parser, scope)
+        expect(calculator.assignable?(t, parser.parse('Hash[String,Variant[String,Hash[String,Variant[String,String]]]]'))).to be_truthy
+      end
+
+
+      it 'similar recursive aliases are assignable' do
+        scope = Object.new
+
+        t1 = type_alias_t('Tree1', 'Hash[String,Variant[String,Tree1]]')
+        t2 = type_alias_t('Tree2', 'Hash[String,Variant[String,Tree2]]')
+        loader = Object.new
+        loader.expects(:load).with(:type, 'tree1').returns t1
+        loader.expects(:load).with(:type, 'tree2').returns t2
+
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).with(instance_of(Model::QualifiedReference), scope).at_least_once.returns loader
+
+        t1.resolve(parser, scope)
+        t2.resolve(parser, scope)
+        expect(calculator.assignable?(t1, t2)).to be_truthy
+      end
+
+      it 'crossing recursive aliases are assignable' do
+        scope = Object.new
+
+        t1 = type_alias_t('Tree1', 'Hash[String,Variant[String,Tree2]]')
+        t2 = type_alias_t('Tree2', 'Hash[String,Variant[String,Tree1]]')
+        loader = Object.new
+        loader.expects(:load).with(:type, 'tree1').returns t1
+        loader.expects(:load).with(:type, 'tree2').returns t2
+        loader.expects(:is_a?).with(Loader::Loader).returns true
+
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).with(instance_of(Model::QualifiedReference), scope).at_least_once.returns loader
+
+        t1.resolve(parser, scope)
+        t2.resolve(parser, scope)
+        expect(calculator.assignable?(t1, t2)).to be_truthy
+      end
+
+      it 'Type[T] is assignable to Type[AT] when AT is an alias for T' do
+        scope = Object.new
+
+        ta = type_alias_t('PositiveInteger', 'Integer[0,default]')
+        loader = Object.new
+        loader.expects(:load).with(:type, 'positiveinteger').returns ta
+        Adapters::LoaderAdapter.expects(:loader_for_model_object)
+          .with(instance_of(Model::QualifiedReference), scope).returns loader
+
+        t1 = type_t(range_t(0, :default))
+        t2 = parser.parse('Type[PositiveInteger]', scope)
+        expect(calculator.assignable?(t2, t1)).to be_truthy
+      end
+
+      it 'Type[T] is assignable to AT when AT is an alias for Type[T]' do
+        scope = Object.new
+
+        ta = type_alias_t('PositiveIntegerType', 'Type[Integer[0,default]]')
+        loader = Object.new
+        loader.expects(:load).with(:type, 'positiveintegertype').returns ta
+        Adapters::LoaderAdapter.expects(:loader_for_model_object)
+          .with(instance_of(Model::QualifiedReference), scope).returns loader
+
+        t1 = type_t(range_t(0, :default))
+        t2 = parser.parse('PositiveIntegerType', scope)
+        expect(calculator.assignable?(t2, t1)).to be_truthy
+      end
+
+      it 'Type[Type[T]] is assignable to Type[Type[AT]] when AT is an alias for T' do
+        scope = Object.new
+
+        ta = type_alias_t('PositiveInteger', 'Integer[0,default]')
+        loader = Object.new
+        loader.expects(:load).with(:type, 'positiveinteger').returns ta
+        Adapters::LoaderAdapter.expects(:loader_for_model_object)
+          .with(instance_of(Model::QualifiedReference), scope).returns loader
+
+        t1 = type_t(type_t(range_t(0, :default)))
+        t2 = parser.parse('Type[Type[PositiveInteger]]', scope)
+        expect(calculator.assignable?(t2, t1)).to be_truthy
+      end
+
+      it 'Type[Type[T]] is assignable to Type[AT] when AT is an alias for Type[T]' do
+        scope = Object.new
+
+        ta = type_alias_t('PositiveIntegerType', 'Type[Integer[0,default]]')
+        loader = Object.new
+        loader.expects(:load).with(:type, 'positiveintegertype').returns ta
+        Adapters::LoaderAdapter.expects(:loader_for_model_object)
+          .with(instance_of(Model::QualifiedReference), scope).returns loader
+
+        t1 = type_t(type_t(range_t(0, :default)))
+        t2 = parser.parse('Type[PositiveIntegerType]', scope)
+        expect(calculator.assignable?(t2, t1)).to be_truthy
+      end
+    end
   end
 
   context 'when testing if x is instance of type t' do
-    include_context "types_setup"
+    include_context 'types_setup'
 
     it 'should consider undef to be instance of Any, NilType, and optional' do
-      expect(calculator.instance?(Puppet::Pops::Types::PUndefType.new(), nil)).to    eq(true)
-      expect(calculator.instance?(Puppet::Pops::Types::PAnyType.new(), nil)).to eq(true)
-      expect(calculator.instance?(Puppet::Pops::Types::POptionalType.new(), nil)).to eq(true)
+      expect(calculator.instance?(PUndefType::DEFAULT, nil)).to    eq(true)
+      expect(calculator.instance?(PAnyType::DEFAULT, nil)).to eq(true)
+      expect(calculator.instance?(POptionalType::DEFAULT, nil)).to eq(true)
     end
 
     it 'all types should be (ruby) instance of PAnyType' do
       all_types.each do |t|
-        expect(t.new.is_a?(Puppet::Pops::Types::PAnyType)).to eq(true)
+        expect(t::DEFAULT.is_a?(PAnyType)).to eq(true)
       end
     end
 
-    it "should consider :undef to be instance of Runtime['ruby', 'Symbol]" do
-      expect(calculator.instance?(Puppet::Pops::Types::PRuntimeType.new(:runtime => :ruby, :runtime_type_name => 'Symbol'), :undef)).to eq(true)
+    it "should infer :undef to be Undef" do
+      expect(calculator.infer(:undef)).to be_assignable_to(undef_t)
     end
 
-    it "should consider :undef to be instance of an Optional type" do
-      expect(calculator.instance?(Puppet::Pops::Types::POptionalType.new(), :undef)).to eq(true)
+    it "should not consider :default to be instance of Runtime['ruby', 'Symbol]" do
+      expect(calculator.instance?(PRuntimeType.new(:ruby, 'Symbol'), :default)).to eq(false)
     end
 
-    it 'should not consider undef to be an instance of any other type than Any, NilType and Data' do
+    it "should not consider :undef to be instance of Runtime['ruby', 'Symbol]" do
+      expect(calculator.instance?(PRuntimeType.new(:ruby, 'Symbol'), :undef)).to eq(false)
+    end
+
+    it 'should consider :undef to be instance of an Optional type' do
+      expect(calculator.instance?(POptionalType::DEFAULT, :undef)).to eq(true)
+    end
+
+    it 'should not consider undef to be an instance of any other type than Any, UndefType and Data' do
       types_to_test = all_types - [
-        Puppet::Pops::Types::PAnyType,
-        Puppet::Pops::Types::PUndefType,
-        Puppet::Pops::Types::PDataType,
-        Puppet::Pops::Types::POptionalType,
+        PAnyType,
+        PUndefType,
+        PDataType,
+        POptionalType,
         ]
 
-      types_to_test.each {|t| expect(calculator.instance?(t.new, nil)).to eq(false) }
-      types_to_test.each {|t| expect(calculator.instance?(t.new, :undef)).to eq(false) }
+      types_to_test.each {|t| expect(calculator.instance?(t::DEFAULT, nil)).to eq(false) }
+      types_to_test.each {|t| expect(calculator.instance?(t::DEFAULT, :undef)).to eq(false) }
     end
 
     it 'should consider default to be instance of Default and Any' do
-      expect(calculator.instance?(Puppet::Pops::Types::PDefaultType.new(), :default)).to eq(true)
-      expect(calculator.instance?(Puppet::Pops::Types::PAnyType.new(), :default)).to eq(true)
+      expect(calculator.instance?(PDefaultType::DEFAULT, :default)).to eq(true)
+      expect(calculator.instance?(PAnyType::DEFAULT, :default)).to eq(true)
     end
 
-    it 'should not consider "default" to be an instance of anything but Default, and Any' do
+    it 'should not consider "default" to be an instance of anything but Default, NotUndef, and Any' do
       types_to_test = all_types - [
-        Puppet::Pops::Types::PAnyType,
-        Puppet::Pops::Types::PDefaultType,
+        PAnyType,
+        PNotUndefType,
+        PDefaultType,
         ]
 
-      types_to_test.each {|t| expect(calculator.instance?(t.new, :default)).to eq(false) }
+      types_to_test.each {|t| expect(calculator.instance?(t::DEFAULT, :default)).to eq(false) }
     end
 
     it 'should consider fixnum instanceof PIntegerType' do
-      expect(calculator.instance?(Puppet::Pops::Types::PIntegerType.new(), 1)).to eq(true)
+      expect(calculator.instance?(PIntegerType::DEFAULT, 1)).to eq(true)
     end
 
     it 'should consider fixnum instanceof Fixnum' do
@@ -1274,15 +1653,21 @@ describe 'The type calculator' do
     end
 
     it 'should consider string in length range' do
-      range = factory.constrain_size(string_t, 1,3)
+      range = constrained_string_t(range_t(1,3))
       expect(calculator.instance?(range, 'a')).to    eq(true)
       expect(calculator.instance?(range, 'abc')).to  eq(true)
       expect(calculator.instance?(range, '')).to     eq(false)
       expect(calculator.instance?(range, 'abcd')).to eq(false)
     end
 
+    it 'should consider string values' do
+      string = string_t('a')
+      expect(calculator.instance?(string, 'a')).to eq(true)
+      expect(calculator.instance?(string, 'c')).to eq(false)
+    end
+
     it 'should consider array in length range' do
-      range = factory.constrain_size(array_t(integer_t), 1,3)
+      range = array_t(integer_t, range_t(1,3))
       expect(calculator.instance?(range, [1])).to    eq(true)
       expect(calculator.instance?(range, [1,2,3])).to  eq(true)
       expect(calculator.instance?(range, [])).to     eq(false)
@@ -1290,7 +1675,7 @@ describe 'The type calculator' do
     end
 
     it 'should consider hash in length range' do
-      range = factory.constrain_size(hash_t(integer_t, integer_t), 1,2)
+      range = hash_t(integer_t, integer_t, range_t(1,2))
       expect(calculator.instance?(range, {1=>1})).to             eq(true)
       expect(calculator.instance?(range, {1=>1, 2=>2})).to       eq(true)
       expect(calculator.instance?(range, {})).to                 eq(false)
@@ -1298,7 +1683,7 @@ describe 'The type calculator' do
     end
 
     it 'should consider collection in length range for array ' do
-      range = factory.constrain_size(collection_t, 1,3)
+      range = collection_t(range_t(1,3))
       expect(calculator.instance?(range, [1])).to    eq(true)
       expect(calculator.instance?(range, [1,2,3])).to  eq(true)
       expect(calculator.instance?(range, [])).to     eq(false)
@@ -1306,7 +1691,7 @@ describe 'The type calculator' do
     end
 
     it 'should consider collection in length range for hash' do
-      range = factory.constrain_size(collection_t, 1,2)
+      range = collection_t(range_t(1,2))
       expect(calculator.instance?(range, {1=>1})).to             eq(true)
       expect(calculator.instance?(range, {1=>1, 2=>2})).to       eq(true)
       expect(calculator.instance?(range, {})).to                 eq(false)
@@ -1380,6 +1765,26 @@ describe 'The type calculator' do
         struct = struct_t({'a'=>Integer, 'b'=>String, 'c'=>optional_t(Float)})
         expect(calculator.instance?(struct, {'a'=>1, 'b'=>'a', 'c'=>'x'})).to eq(false)
       end
+
+      it 'should consider nil to be a valid element value' do
+        struct = struct_t({not_undef_t('a') => object_t, 'b'=>String})
+        expect(calculator.instance?(struct, {'a'=>nil , 'b'=>'a'})).to eq(true)
+      end
+
+      it 'should consider nil to be a valid element value but subject to value type' do
+        struct = struct_t({not_undef_t('a') => String, 'b'=>String})
+        expect(calculator.instance?(struct, {'a'=>nil , 'b'=>'a'})).to eq(false)
+      end
+
+      it 'should consider nil to be a valid element value but subject to value type even when key is optional' do
+        struct = struct_t({optional_t('a') => String, 'b'=>String})
+        expect(calculator.instance?(struct, {'a'=>nil , 'b'=>'a'})).to eq(false)
+      end
+
+      it 'should consider a hash where optional key is missing as assignable even if value of optional key is required' do
+        struct = struct_t({optional_t('a') => String, 'b'=>String})
+        expect(calculator.instance?(struct, {'b'=>'a'})).to eq(true)
+      end
     end
 
     context 'and t is Data' do
@@ -1417,13 +1822,13 @@ describe 'The type calculator' do
       end
     end
 
-    context "and t is something Callable" do
+    context 'and t is something Callable' do
 
       it 'a Closure should be considered a Callable' do
-        factory = Puppet::Pops::Model::Factory
+        factory = Model::Factory
         params = [factory.PARAM('a')]
-        the_block = factory.LAMBDA(params,factory.literal(42))
-        the_closure = Puppet::Pops::Evaluator::Closure.new(:fake_evaluator, the_block, :fake_scope)
+        the_block = factory.LAMBDA(params,factory.literal(42), nil)
+        the_closure = Evaluator::Closure::Dynamic.new(:fake_evaluator, the_block, :fake_scope)
         expect(calculator.instance?(all_callables_t, the_closure)).to be_truthy
         expect(calculator.instance?(callable_t(object_t), the_closure)).to be_truthy
         expect(calculator.instance?(callable_t(object_t, object_t), the_closure)).to be_falsey
@@ -1446,456 +1851,287 @@ describe 'The type calculator' do
         expect(calculator.instance?(callable_t(String), f)).to be_truthy
       end
     end
+
+    context 'and t is a TypeAlias' do
+      let!(:parser) { TypeParser.singleton }
+
+      it 'should consider x an instance of the aliased simple type' do
+        t = type_alias_t('Alias', 'Integer').resolve(parser, nil)
+        expect(calculator.instance?(t, 15)).to be_truthy
+      end
+
+      it 'should consider x an instance of the aliased parameterized type' do
+        t = type_alias_t('Alias', 'Integer[0,20]').resolve(parser, nil)
+        expect(calculator.instance?(t, 15)).to be_truthy
+      end
+
+      it 'should consider x an instance of the aliased type that uses self recursion' do
+        scope = Object.new
+
+        t = type_alias_t('Tree', 'Hash[String,Variant[String,Tree]]')
+        loader = Object.new
+        loader.expects(:load).with(:type, 'tree').returns t
+
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).with(instance_of(Model::QualifiedReference), scope).at_most_once.returns loader
+
+        t.resolve(parser, scope)
+        expect(calculator.instance?(t, {'a'=>{'aa'=>{'aaa'=>'aaaa'}}, 'b'=>'bb'})).to be_truthy
+      end
+
+      it 'should consider x an instance of the aliased type that uses contains an alias that causes self recursion' do
+        scope = Object.new
+
+        t1 = type_alias_t('Tree', 'Hash[String,Variant[String,OtherTree]]')
+        t2 = type_alias_t('OtherTree', 'Hash[String,Tree]')
+        loader = Object.new
+        loader.expects(:load).with(:type, 'tree').returns t1
+        loader.expects(:load).with(:type, 'othertree').returns t2
+        loader.expects(:is_a?).with(Loader::Loader).returns true
+
+        Adapters::LoaderAdapter.expects(:loader_for_model_object).with(instance_of(Model::QualifiedReference), scope).at_least_once.returns loader
+
+        t1.resolve(parser, scope)
+        expect(calculator.instance?(t1, {'a'=>{'aa'=>{'aaa'=>'aaaa'}}, 'b'=>'bb'})).to be_truthy
+      end
+    end
   end
 
   context 'when converting a ruby class' do
     it 'should yield \'PIntegerType\' for Integer, Fixnum, and Bignum' do
       [Integer,Fixnum,Bignum].each do |c|
-        expect(calculator.type(c).class).to eq(Puppet::Pops::Types::PIntegerType)
+        expect(calculator.type(c).class).to eq(PIntegerType)
       end
     end
 
     it 'should yield \'PFloatType\' for Float' do
-      expect(calculator.type(Float).class).to eq(Puppet::Pops::Types::PFloatType)
+      expect(calculator.type(Float).class).to eq(PFloatType)
     end
 
     it 'should yield \'PBooleanType\' for FalseClass and TrueClass' do
       [FalseClass,TrueClass].each do |c|
-        expect(calculator.type(c).class).to eq(Puppet::Pops::Types::PBooleanType)
+        expect(calculator.type(c).class).to eq(PBooleanType)
       end
     end
 
     it 'should yield \'PUndefType\' for NilClass' do
-      expect(calculator.type(NilClass).class).to eq(Puppet::Pops::Types::PUndefType)
+      expect(calculator.type(NilClass).class).to eq(PUndefType)
     end
 
     it 'should yield \'PStringType\' for String' do
-      expect(calculator.type(String).class).to eq(Puppet::Pops::Types::PStringType)
+      expect(calculator.type(String).class).to eq(PStringType)
     end
 
     it 'should yield \'PRegexpType\' for Regexp' do
-      expect(calculator.type(Regexp).class).to eq(Puppet::Pops::Types::PRegexpType)
+      expect(calculator.type(Regexp).class).to eq(PRegexpType)
     end
 
     it 'should yield \'PArrayType[PDataType]\' for Array' do
       t = calculator.type(Array)
-      expect(t.class).to eq(Puppet::Pops::Types::PArrayType)
-      expect(t.element_type.class).to eq(Puppet::Pops::Types::PDataType)
+      expect(t.class).to eq(PArrayType)
+      expect(t.element_type.class).to eq(PDataType)
     end
 
     it 'should yield \'PHashType[PScalarType,PDataType]\' for Hash' do
       t = calculator.type(Hash)
-      expect(t.class).to eq(Puppet::Pops::Types::PHashType)
-      expect(t.key_type.class).to eq(Puppet::Pops::Types::PScalarType)
-      expect(t.element_type.class).to eq(Puppet::Pops::Types::PDataType)
-    end
-  end
-
-  context 'when representing the type as string' do
-    it 'should yield \'Type\' for PType' do
-      expect(calculator.string(Puppet::Pops::Types::PType.new())).to eq('Type')
-    end
-
-    it 'should yield \'Object\' for PAnyType' do
-      expect(calculator.string(Puppet::Pops::Types::PAnyType.new())).to eq('Any')
-    end
-
-    it 'should yield \'Scalar\' for PScalarType' do
-      expect(calculator.string(Puppet::Pops::Types::PScalarType.new())).to eq('Scalar')
-    end
-
-    it 'should yield \'Boolean\' for PBooleanType' do
-      expect(calculator.string(Puppet::Pops::Types::PBooleanType.new())).to eq('Boolean')
-    end
-
-    it 'should yield \'Data\' for PDataType' do
-      expect(calculator.string(Puppet::Pops::Types::PDataType.new())).to eq('Data')
-    end
-
-    it 'should yield \'Numeric\' for PNumericType' do
-      expect(calculator.string(Puppet::Pops::Types::PNumericType.new())).to eq('Numeric')
-    end
-
-    it 'should yield \'Integer\' and from/to for PIntegerType' do
-      int_T = Puppet::Pops::Types::PIntegerType
-      expect(calculator.string(int_T.new())).to eq('Integer')
-      int = int_T.new()
-      int.from = 1
-      int.to = 1
-      expect(calculator.string(int)).to eq('Integer[1, 1]')
-      int = int_T.new()
-      int.from = 1
-      int.to = 2
-      expect(calculator.string(int)).to eq('Integer[1, 2]')
-      int = int_T.new()
-      int.from = nil
-      int.to = 2
-      expect(calculator.string(int)).to eq('Integer[default, 2]')
-      int = int_T.new()
-      int.from = 2
-      int.to = nil
-      expect(calculator.string(int)).to eq('Integer[2, default]')
-    end
-
-    it 'should yield \'Float\' for PFloatType' do
-      expect(calculator.string(Puppet::Pops::Types::PFloatType.new())).to eq('Float')
-    end
-
-    it 'should yield \'Regexp\' for PRegexpType' do
-      expect(calculator.string(Puppet::Pops::Types::PRegexpType.new())).to eq('Regexp')
-    end
-
-    it 'should yield \'Regexp[/pat/]\' for parameterized PRegexpType' do
-      t = Puppet::Pops::Types::PRegexpType.new()
-      t.pattern = ('a/b')
-      expect(calculator.string(Puppet::Pops::Types::PRegexpType.new())).to eq('Regexp')
-    end
-
-    it 'should yield \'String\' for PStringType' do
-      expect(calculator.string(Puppet::Pops::Types::PStringType.new())).to eq('String')
-    end
-
-    it 'should yield \'String\' for PStringType with multiple values' do
-      expect(calculator.string(string_t('a', 'b', 'c'))).to eq('String')
-    end
-
-    it 'should yield \'String\' and from/to for PStringType' do
-      string_T = Puppet::Pops::Types::PStringType
-      expect(calculator.string(factory.constrain_size(string_T.new(), 1,1))).to eq('String[1, 1]')
-      expect(calculator.string(factory.constrain_size(string_T.new(), 1,2))).to eq('String[1, 2]')
-      expect(calculator.string(factory.constrain_size(string_T.new(), :default, 2))).to eq('String[default, 2]')
-      expect(calculator.string(factory.constrain_size(string_T.new(), 2, :default))).to eq('String[2, default]')
-    end
-
-    it 'should yield \'Array[Integer]\' for PArrayType[PIntegerType]' do
-      t = Puppet::Pops::Types::PArrayType.new()
-      t.element_type = Puppet::Pops::Types::PIntegerType.new()
-      expect(calculator.string(t)).to eq('Array[Integer]')
-    end
-
-    it 'should yield \'Collection\' and from/to for PCollectionType' do
-      col = collection_t()
-      expect(calculator.string(factory.constrain_size(col.copy, 1,1))).to eq('Collection[1, 1]')
-      expect(calculator.string(factory.constrain_size(col.copy, 1,2))).to eq('Collection[1, 2]')
-      expect(calculator.string(factory.constrain_size(col.copy, :default, 2))).to eq('Collection[default, 2]')
-      expect(calculator.string(factory.constrain_size(col.copy, 2, :default))).to eq('Collection[2, default]')
-    end
-
-    it 'should yield \'Array\' and from/to for PArrayType' do
-      arr = array_t(string_t)
-      expect(calculator.string(factory.constrain_size(arr.copy, 1,1))).to eq('Array[String, 1, 1]')
-      expect(calculator.string(factory.constrain_size(arr.copy, 1,2))).to eq('Array[String, 1, 2]')
-      expect(calculator.string(factory.constrain_size(arr.copy, :default, 2))).to eq('Array[String, default, 2]')
-      expect(calculator.string(factory.constrain_size(arr.copy, 2, :default))).to eq('Array[String, 2, default]')
-    end
-
-    it 'should yield \'Tuple[Integer]\' for PTupleType[PIntegerType]' do
-      t = Puppet::Pops::Types::PTupleType.new()
-      t.addTypes(Puppet::Pops::Types::PIntegerType.new())
-      expect(calculator.string(t)).to eq('Tuple[Integer]')
-    end
-
-    it 'should yield \'Tuple[T, T,..]\' for PTupleType[T, T, ...]' do
-      t = Puppet::Pops::Types::PTupleType.new()
-      t.addTypes(Puppet::Pops::Types::PIntegerType.new())
-      t.addTypes(Puppet::Pops::Types::PIntegerType.new())
-      t.addTypes(Puppet::Pops::Types::PStringType.new())
-      expect(calculator.string(t)).to eq('Tuple[Integer, Integer, String]')
-    end
-
-    it 'should yield \'Tuple\' and from/to for PTupleType' do
-      tuple_t = tuple_t(string_t)
-      expect(calculator.string(factory.constrain_size(tuple_t.copy, 1,1))).to eq('Tuple[String, 1, 1]')
-      expect(calculator.string(factory.constrain_size(tuple_t.copy, 1,2))).to eq('Tuple[String, 1, 2]')
-      expect(calculator.string(factory.constrain_size(tuple_t.copy, :default, 2))).to eq('Tuple[String, default, 2]')
-      expect(calculator.string(factory.constrain_size(tuple_t.copy, 2, :default))).to eq('Tuple[String, 2, default]')
-    end
-
-    it 'should yield \'Struct\' and details for PStructType' do
-      struct_t = struct_t({'a'=>Integer, 'b'=>String})
-      expect(calculator.string(struct_t)).to eq("Struct[{'a'=>Integer, 'b'=>String}]")
-      struct_t = struct_t({})
-      expect(calculator.string(struct_t)).to eq("Struct")
-    end
-
-    it 'should yield \'Hash[String, Integer]\' for PHashType[PStringType, PIntegerType]' do
-      t = Puppet::Pops::Types::PHashType.new()
-      t.key_type = Puppet::Pops::Types::PStringType.new()
-      t.element_type = Puppet::Pops::Types::PIntegerType.new()
-      expect(calculator.string(t)).to eq('Hash[String, Integer]')
-    end
-
-    it 'should yield \'Hash\' and from/to for PHashType' do
-      hsh = hash_t(string_t, string_t)
-      expect(calculator.string(factory.constrain_size(hsh.copy, 1,1))).to eq('Hash[String, String, 1, 1]')
-      expect(calculator.string(factory.constrain_size(hsh.copy, 1,2))).to eq('Hash[String, String, 1, 2]')
-      expect(calculator.string(factory.constrain_size(hsh.copy, :default, 2))).to eq('Hash[String, String, default, 2]')
-      expect(calculator.string(factory.constrain_size(hsh.copy, 2, :default))).to eq('Hash[String, String, 2, default]')
-    end
-
-    it "should yield 'Class' for a PHostClassType" do
-      t = Puppet::Pops::Types::PHostClassType.new()
-      expect(calculator.string(t)).to eq('Class')
-    end
-
-    it "should yield 'Class[x]' for a PHostClassType[x]" do
-      t = Puppet::Pops::Types::PHostClassType.new()
-      t.class_name = 'x'
-      expect(calculator.string(t)).to eq('Class[x]')
-    end
-
-    it "should yield 'Resource' for a PResourceType" do
-      t = Puppet::Pops::Types::PResourceType.new()
-      expect(calculator.string(t)).to eq('Resource')
-    end
-
-    it 'should yield \'File\' for a PResourceType[\'File\']' do
-      t = Puppet::Pops::Types::PResourceType.new()
-      t.type_name = 'File'
-      expect(calculator.string(t)).to eq('File')
-    end
-
-    it "should yield 'File['/tmp/foo']' for a PResourceType['File', '/tmp/foo']" do
-      t = Puppet::Pops::Types::PResourceType.new()
-      t.type_name = 'File'
-      t.title = '/tmp/foo'
-      expect(calculator.string(t)).to eq("File['/tmp/foo']")
-    end
-
-    it "should yield 'Enum[s,...]' for a PEnumType[s,...]" do
-      t = enum_t('a', 'b', 'c')
-      expect(calculator.string(t)).to eq("Enum['a', 'b', 'c']")
-    end
-
-    it "should yield 'Pattern[/pat/,...]' for a PPatternType['pat',...]" do
-      t = pattern_t('a')
-      t2 = pattern_t('a', 'b', 'c')
-      expect(calculator.string(t)).to eq("Pattern[/a/]")
-      expect(calculator.string(t2)).to eq("Pattern[/a/, /b/, /c/]")
-    end
-
-    it "should escape special characters in the string for a PPatternType['pat',...]" do
-      t = pattern_t('a/b')
-      expect(calculator.string(t)).to eq("Pattern[/a\\/b/]")
-    end
-
-    it "should yield 'Variant[t1,t2,...]' for a PVariantType[t1, t2,...]" do
-      t1 = string_t()
-      t2 = integer_t()
-      t3 = pattern_t('a')
-      t = variant_t(t1, t2, t3)
-      expect(calculator.string(t)).to eq("Variant[String, Integer, Pattern[/a/]]")
-    end
-
-    it "should yield 'Callable' for generic callable" do
-      expect(calculator.string(all_callables_t)).to eql("Callable")
-    end
-
-    it "should yield 'Callable[0,0]' for callable without params" do
-      expect(calculator.string(callable_t)).to eql("Callable[0, 0]")
-    end
-
-    it "should yield 'Callable[t,t]' for callable with typed parameters" do
-      expect(calculator.string(callable_t(String, Integer))).to eql("Callable[String, Integer]")
-    end
-
-    it "should yield 'Callable[t,min,max]' for callable with size constraint (infinite max)" do
-      expect(calculator.string(callable_t(String, 0))).to eql("Callable[String, 0, default]")
-    end
-
-    it "should yield 'Callable[t,min,max]' for callable with size constraint (capped max)" do
-      expect(calculator.string(callable_t(String, 0, 3))).to eql("Callable[String, 0, 3]")
-    end
-
-    it "should yield 'Callable[min,max]' callable with size > 0" do
-      expect(calculator.string(callable_t(0, 0))).to eql("Callable[0, 0]")
-      expect(calculator.string(callable_t(0, 1))).to eql("Callable[0, 1]")
-      expect(calculator.string(callable_t(0, :default))).to eql("Callable[0, default]")
-    end
-
-    it "should yield 'Callable[Callable]' for callable with block" do
-      expect(calculator.string(callable_t(all_callables_t))).to eql("Callable[0, 0, Callable]")
-      expect(calculator.string(callable_t(string_t, all_callables_t))).to eql("Callable[String, Callable]")
-      expect(calculator.string(callable_t(string_t, 1,1, all_callables_t))).to eql("Callable[String, 1, 1, Callable]")
-    end
-
-    it "should yield Unit for a Unit type" do
-      expect(calculator.string(unit_t)).to eql('Unit')
+      expect(t.class).to eq(PHashType)
+      expect(t.key_type.class).to eq(PScalarType)
+      expect(t.value_type.class).to eq(PDataType)
     end
   end
 
   context 'when processing meta type' do
     it 'should infer PType as the type of all other types' do
-      ptype = Puppet::Pops::Types::PType
-      expect(calculator.infer(Puppet::Pops::Types::PUndefType.new()       ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PDataType.new()      ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PScalarType.new()   ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PStringType.new()    ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PNumericType.new()   ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PIntegerType.new()   ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PFloatType.new()     ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PRegexpType.new()   ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PBooleanType.new()   ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PCollectionType.new()).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PArrayType.new()     ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PHashType.new()      ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PRuntimeType.new()   ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PHostClassType.new() ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PResourceType.new()  ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PEnumType.new()      ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PPatternType.new()   ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PVariantType.new()   ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PTupleType.new()     ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::POptionalType.new()  ).is_a?(ptype)).to eq(true)
-      expect(calculator.infer(Puppet::Pops::Types::PCallableType.new()  ).is_a?(ptype)).to eq(true)
+      ptype = PType
+      expect(calculator.infer(PUndefType::DEFAULT     ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PDataType::DEFAULT      ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PScalarType::DEFAULT    ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PStringType::DEFAULT    ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PNumericType::DEFAULT   ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PIntegerType::DEFAULT   ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PFloatType::DEFAULT     ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PRegexpType::DEFAULT    ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PBooleanType::DEFAULT   ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PCollectionType::DEFAULT).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PArrayType::DEFAULT     ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PHashType::DEFAULT      ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PIterableType::DEFAULT  ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PRuntimeType::DEFAULT   ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PHostClassType::DEFAULT ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PResourceType::DEFAULT  ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PEnumType::DEFAULT      ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PPatternType::DEFAULT   ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PVariantType::DEFAULT   ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PTupleType::DEFAULT     ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(POptionalType::DEFAULT  ).is_a?(ptype)).to eq(true)
+      expect(calculator.infer(PCallableType::DEFAULT  ).is_a?(ptype)).to eq(true)
     end
 
     it 'should infer PType as the type of all other types' do
-      ptype = Puppet::Pops::Types::PType
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PUndefType.new()       ))).to eq("Type[Undef]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PDataType.new()      ))).to eq("Type[Data]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PScalarType.new()   ))).to eq("Type[Scalar]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PStringType.new()    ))).to eq("Type[String]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PNumericType.new()   ))).to eq("Type[Numeric]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PIntegerType.new()   ))).to eq("Type[Integer]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PFloatType.new()     ))).to eq("Type[Float]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PRegexpType.new()    ))).to eq("Type[Regexp]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PBooleanType.new()   ))).to eq("Type[Boolean]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PCollectionType.new()))).to eq("Type[Collection]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PArrayType.new()     ))).to eq("Type[Array[?]]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PHashType.new()      ))).to eq("Type[Hash[?, ?]]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PRuntimeType.new()   ))).to eq("Type[Runtime[?, ?]]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PHostClassType.new() ))).to eq("Type[Class]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PResourceType.new()  ))).to eq("Type[Resource]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PEnumType.new()      ))).to eq("Type[Enum]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PVariantType.new()   ))).to eq("Type[Variant]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PPatternType.new()   ))).to eq("Type[Pattern]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PTupleType.new()     ))).to eq("Type[Tuple]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::POptionalType.new()  ))).to eq("Type[Optional]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PCallableType.new()  ))).to eq("Type[Callable]")
-
-      expect(calculator.infer(Puppet::Pops::Types::PResourceType.new(:type_name => 'foo::fee::fum')).to_s).to eq("Type[Foo::Fee::Fum]")
-      expect(calculator.string(calculator.infer(Puppet::Pops::Types::PResourceType.new(:type_name => 'foo::fee::fum')))).to eq("Type[Foo::Fee::Fum]")
-      expect(calculator.infer(Puppet::Pops::Types::PResourceType.new(:type_name => 'Foo::Fee::Fum')).to_s).to eq("Type[Foo::Fee::Fum]")
+      expect(calculator.infer(PUndefType::DEFAULT     ).to_s).to eq('Type[Undef]')
+      expect(calculator.infer(PDataType::DEFAULT      ).to_s).to eq('Type[Data]')
+      expect(calculator.infer(PScalarType::DEFAULT    ).to_s).to eq('Type[Scalar]')
+      expect(calculator.infer(PStringType::DEFAULT    ).to_s).to eq('Type[String]')
+      expect(calculator.infer(PNumericType::DEFAULT   ).to_s).to eq('Type[Numeric]')
+      expect(calculator.infer(PIntegerType::DEFAULT   ).to_s).to eq('Type[Integer]')
+      expect(calculator.infer(PFloatType::DEFAULT     ).to_s).to eq('Type[Float]')
+      expect(calculator.infer(PRegexpType::DEFAULT    ).to_s).to eq('Type[Regexp]')
+      expect(calculator.infer(PBooleanType::DEFAULT   ).to_s).to eq('Type[Boolean]')
+      expect(calculator.infer(PCollectionType::DEFAULT).to_s).to eq('Type[Collection]')
+      expect(calculator.infer(PArrayType::DEFAULT     ).to_s).to eq('Type[Array[?]]')
+      expect(calculator.infer(PHashType::DEFAULT      ).to_s).to eq('Type[Hash[?, ?]]')
+      expect(calculator.infer(PIterableType::DEFAULT  ).to_s).to eq('Type[Iterable]')
+      expect(calculator.infer(PRuntimeType::DEFAULT   ).to_s).to eq('Type[Runtime[?, ?]]')
+      expect(calculator.infer(PHostClassType::DEFAULT ).to_s).to eq('Type[Class]')
+      expect(calculator.infer(PResourceType::DEFAULT  ).to_s).to eq('Type[Resource]')
+      expect(calculator.infer(PEnumType::DEFAULT      ).to_s).to eq('Type[Enum]')
+      expect(calculator.infer(PVariantType::DEFAULT   ).to_s).to eq('Type[Variant]')
+      expect(calculator.infer(PPatternType::DEFAULT   ).to_s).to eq('Type[Pattern]')
+      expect(calculator.infer(PTupleType::DEFAULT     ).to_s).to eq('Type[Tuple]')
+      expect(calculator.infer(POptionalType::DEFAULT  ).to_s).to eq('Type[Optional]')
+      expect(calculator.infer(PCallableType::DEFAULT  ).to_s).to eq('Type[Callable]')
+
+      expect(calculator.infer(PResourceType.new('foo::fee::fum')).to_s).to eq('Type[Foo::Fee::Fum]')
+      expect(calculator.infer(PResourceType.new('foo::fee::fum')).to_s).to eq('Type[Foo::Fee::Fum]')
+      expect(calculator.infer(PResourceType.new('Foo::Fee::Fum')).to_s).to eq('Type[Foo::Fee::Fum]')
     end
 
     it "computes the common type of PType's type parameter" do
-      int_t    = Puppet::Pops::Types::PIntegerType.new()
-      string_t = Puppet::Pops::Types::PStringType.new()
-      expect(calculator.string(calculator.infer([int_t]))).to eq("Array[Type[Integer], 1, 1]")
-      expect(calculator.string(calculator.infer([int_t, string_t]))).to eq("Array[Type[Scalar], 2, 2]")
+      int_t    = PIntegerType::DEFAULT
+      string_t = PStringType::DEFAULT
+      expect(calculator.infer([int_t]).to_s).to eq('Array[Type[Integer], 1, 1]')
+      expect(calculator.infer([int_t, string_t]).to_s).to eq('Array[Type[Scalar], 2, 2]')
     end
 
     it 'should infer PType as the type of ruby classes' do
       class Foo
       end
       [Object, Numeric, Integer, Fixnum, Bignum, Float, String, Regexp, Array, Hash, Foo].each do |c|
-        expect(calculator.infer(c).is_a?(Puppet::Pops::Types::PType)).to eq(true)
+        expect(calculator.infer(c).is_a?(PType)).to eq(true)
       end
     end
 
     it 'should infer PType as the type of PType (meta regression short-circuit)' do
-      expect(calculator.infer(Puppet::Pops::Types::PType.new()).is_a?(Puppet::Pops::Types::PType)).to eq(true)
+      expect(calculator.infer(PType::DEFAULT).is_a?(PType)).to eq(true)
     end
 
     it 'computes instance? to be true if parameterized and type match' do
-      int_t    = Puppet::Pops::Types::PIntegerType.new()
-      type_t   = Puppet::Pops::Types::TypeFactory.type_type(int_t)
-      type_type_t   = Puppet::Pops::Types::TypeFactory.type_type(type_t)
+      int_t    = PIntegerType::DEFAULT
+      type_t   = TypeFactory.type_type(int_t)
+      type_type_t   = TypeFactory.type_type(type_t)
       expect(calculator.instance?(type_type_t, type_t)).to eq(true)
     end
 
     it 'computes instance? to be false if parameterized and type do not match' do
-      int_t    = Puppet::Pops::Types::PIntegerType.new()
-      string_t = Puppet::Pops::Types::PStringType.new()
-      type_t   = Puppet::Pops::Types::TypeFactory.type_type(int_t)
-      type_t2   = Puppet::Pops::Types::TypeFactory.type_type(string_t)
-      type_type_t   = Puppet::Pops::Types::TypeFactory.type_type(type_t)
+      int_t    = PIntegerType::DEFAULT
+      string_t = PStringType::DEFAULT
+      type_t   = TypeFactory.type_type(int_t)
+      type_t2   = TypeFactory.type_type(string_t)
+      type_type_t   = TypeFactory.type_type(type_t)
       # i.e. Type[Integer] =~ Type[Type[Integer]] # false
       expect(calculator.instance?(type_type_t, type_t2)).to eq(false)
     end
 
     it 'computes instance? to be true if unparameterized and matched against a type[?]' do
-      int_t    = Puppet::Pops::Types::PIntegerType.new()
-      type_t   = Puppet::Pops::Types::TypeFactory.type_type(int_t)
-      expect(calculator.instance?(Puppet::Pops::Types::PType.new, type_t)).to eq(true)
+      int_t    = PIntegerType::DEFAULT
+      type_t   = TypeFactory.type_type(int_t)
+      expect(calculator.instance?(PType::DEFAULT, type_t)).to eq(true)
     end
   end
 
-  context "when asking for an enumerable " do
-    it "should produce an enumerable for an Integer range that is not infinite" do
-      t = Puppet::Pops::Types::PIntegerType.new()
-      t.from = 1
-      t.to = 10
-      expect(calculator.enumerable(t).respond_to?(:each)).to eq(true)
+  context 'when asking for an iterable ' do
+    it 'should produce an iterable for an Integer range that is finite' do
+      t = PIntegerType.new(1, 10)
+      expect(calculator.iterable(t).respond_to?(:each)).to eq(true)
     end
 
-    it "should not produce an enumerable for an Integer range that has an infinite side" do
-      t = Puppet::Pops::Types::PIntegerType.new()
-      t.from = nil
-      t.to = 10
-      expect(calculator.enumerable(t)).to eq(nil)
+    it 'should not produce an iterable for an Integer range that has an infinite side' do
+      t = PIntegerType.new(nil, 10)
+      expect(calculator.iterable(t)).to eq(nil)
 
-      t = Puppet::Pops::Types::PIntegerType.new()
-      t.from = 1
-      t.to = nil
-      expect(calculator.enumerable(t)).to eq(nil)
+      t = PIntegerType.new(1, nil)
+      expect(calculator.iterable(t)).to eq(nil)
     end
 
-    it "all but Integer range are not enumerable" do
+    it 'all but Integer range are not iterable' do
       [Object, Numeric, Float, String, Regexp, Array, Hash].each do |t|
-        expect(calculator.enumerable(calculator.type(t))).to eq(nil)
+        expect(calculator.iterable(calculator.type(t))).to eq(nil)
       end
     end
   end
 
-  context "when dealing with different types of inference" do
-    it "an instance specific inference is produced by infer" do
+  context 'when dealing with different types of inference' do
+    it 'an instance specific inference is produced by infer' do
       expect(calculator.infer(['a','b']).element_type.values).to eq(['a', 'b'])
     end
 
-    it "a generic inference is produced using infer_generic" do
-      expect(calculator.infer_generic(['a','b']).element_type.values).to eq([])
+    it 'a generic inference is produced using infer_generic' do
+      expect(calculator.infer_generic(['a','b']).element_type).to eql(string_t(range_t(1,1)))
     end
 
-    it "a generic result is created by generalize! given an instance specific result for an Array" do
+    it 'a generic result is created by generalize given an instance specific result for an Array' do
       generic = calculator.infer(['a','b'])
-      expect(generic.element_type.values).to eq(['a', 'b'])
-      calculator.generalize!(generic)
-      expect(generic.element_type.values).to eq([])
+      expect(generic.element_type.values).to eq(['a','b'])
+      generic = generic.generalize
+      expect(generic.element_type).to eql(string_t(range_t(1,1)))
+    end
+
+    it 'a generic result is created by generalize given an instance specific result for a Hash' do
+      generic = calculator.infer({'a' =>1,'bcd' => 2})
+      expect(generic.key_type.values.sort).to eq(['a', 'bcd'])
+      expect(generic.value_type.from).to eq(1)
+      expect(generic.value_type.to).to eq(2)
+      generic = generic.generalize
+      expect(generic.key_type.size_type).to eq(range_t(1,3))
+      expect(generic.value_type.from).to eq(nil)
+      expect(generic.value_type.to).to eq(nil)
+    end
+
+    it 'ensures that Struct key types are not generalized' do
+      generic = struct_t({'a' => object_t}).generalize
+      expect(generic.to_s).to eq("Struct[{'a' => Any}]")
+      generic = struct_t({not_undef_t('a') => object_t}).generalize
+      expect(generic.to_s).to eq("Struct[{NotUndef['a'] => Any}]")
+      generic = struct_t({optional_t('a') => string_t}).generalize
+      expect(generic.to_s).to eq("Struct[{Optional['a'] => String}]")
     end
 
-    it "a generic result is created by generalize! given an instance specific result for a Hash" do
-      generic = calculator.infer({'a' =>1,'b' => 2})
-      expect(generic.key_type.values.sort).to eq(['a', 'b'])
-      expect(generic.element_type.from).to eq(1)
-      expect(generic.element_type.to).to eq(2)
-      calculator.generalize!(generic)
-      expect(generic.key_type.values).to eq([])
-      expect(generic.element_type.from).to eq(nil)
-      expect(generic.element_type.to).to eq(nil)
+    it 'ensures that Struct value types are generalized' do
+      generic = struct_t({'a' => range_t(1, 3)}).generalize
+      expect(generic.to_s).to eq("Struct[{'a' => Integer}]")
     end
 
     it "does not reduce by combining types when using infer_set" do
       element_type = calculator.infer(['a','b',1,2]).element_type
-      expect(element_type.class).to eq(Puppet::Pops::Types::PScalarType)
+      expect(element_type.class).to eq(PScalarType)
       inferred_type = calculator.infer_set(['a','b',1,2])
-      expect(inferred_type.class).to eq(Puppet::Pops::Types::PTupleType)
+      expect(inferred_type.class).to eq(PTupleType)
       element_types = inferred_type.types
-      expect(element_types[0].class).to eq(Puppet::Pops::Types::PStringType)
-      expect(element_types[1].class).to eq(Puppet::Pops::Types::PStringType)
-      expect(element_types[2].class).to eq(Puppet::Pops::Types::PIntegerType)
-      expect(element_types[3].class).to eq(Puppet::Pops::Types::PIntegerType)
+      expect(element_types[0].class).to eq(PStringType)
+      expect(element_types[1].class).to eq(PStringType)
+      expect(element_types[2].class).to eq(PIntegerType)
+      expect(element_types[3].class).to eq(PIntegerType)
     end
 
-    it "does not reduce by combining types when using infer_set and values are undef" do
+    it 'does not reduce by combining types when using infer_set and values are undef' do
       element_type = calculator.infer(['a',nil]).element_type
-      expect(element_type.class).to eq(Puppet::Pops::Types::PStringType)
+      expect(element_type.class).to eq(PStringType)
       inferred_type = calculator.infer_set(['a',nil])
-      expect(inferred_type.class).to eq(Puppet::Pops::Types::PTupleType)
+      expect(inferred_type.class).to eq(PTupleType)
       element_types = inferred_type.types
-      expect(element_types[0].class).to eq(Puppet::Pops::Types::PStringType)
-      expect(element_types[1].class).to eq(Puppet::Pops::Types::PUndefType)
+      expect(element_types[0].class).to eq(PStringType)
+      expect(element_types[1].class).to eq(PUndefType)
+    end
+
+    it 'infers on an empty Array produces Array[Unit,0,0]' do
+      inferred_type = calculator.infer([])
+      expect(inferred_type.element_type.class).to eq(PUnitType)
+      expect(inferred_type.size_range).to eq([0, 0])
+    end
+
+    it 'infer_set on an empty Array produces Array[Unit,0,0]' do
+      inferred_type = calculator.infer_set([])
+      expect(inferred_type.element_type.class).to eq(PUnitType)
+      expect(inferred_type.size_range).to eq([0, 0])
     end
   end
 
@@ -1921,8 +2157,7 @@ describe 'The type calculator' do
 
       it 'with args array' do
         required = callable_t(string_t)
-        given = array_t(string_t)
-        factory.constrain_size(given, 1, 1)
+        given = array_t(string_t, range_t(1, 1))
         expect(calculator.callable?(required, given)).to eq(true)
       end
     end
@@ -1981,7 +2216,7 @@ describe 'The type calculator' do
   end
 
   matcher :be_assignable_to do |type|
-    calc = Puppet::Pops::Types::TypeCalculator.new
+    calc = TypeCalculator.singleton
 
     match do |actual|
       calc.assignable?(type, actual)
@@ -1995,5 +2230,6 @@ describe 'The type calculator' do
       "#{calc.string(actual)} is assignable to #{calc.string(type)} when it should not"
     end
   end
-
+end
+end
 end