Fix field root import for fields with generic containing types. More tests.