Added some changes

Unit tests for class DAO