moved CommonDataStructures from test to main and removed TestClass from
test