Updated TypeSystem; updated test