Find TypeSystem xml more intellectually
UnitClassifier more complete test