Made test generic to IGD interface