Restructing unit tests for CDS
Moved cds unit tests to unit dir, so we may introduce integration tests