Added namespace to option's data elements
Updated test cases for namespaces