More work on type inspections

Enabled two more tests.
Fixed one more test.