Namespace enhancement for REF-102, and fixed GTM ADT test issue