merge
added dds tests for modularization
merge