Unittest basics

* Updated Makefile.
* Added Catch unit testing framework support.
* Added some basic unit tests for dataSource.
* Other small changes