Added additional test cases based on namespace resolution. Also added another place where type needed to be expanded to full namespace.