Regenerated, removed obsolete test.
Simplified the way ComplexTypeValidator works.