Fixed all the existing unit-tests for DataSource
Unified the two copiers and tested DataSource