Updated and extended tests to follow new hierarchical element parsing
Updated and extended tests to follow new hierarchical element parsing

StratusLab/client,StratusLab/client,StratusLab/client,StratusLab/client