Merge "Add test for type resolution."