Converting type map to a hash lookup.
Fixing test that expected a VARCHAR.