GetAttributesByType v2.0 support, Fixing tests