Added tests for DAO