Made type checks explicit

These will no longer happen during partial tests or when an error aborts
an import, because the type check is not enabled until the end