Replace more occurrences of `String` with `Type`

Imports in tests also fixed.