Added more tests for the DAO layer