Updated test coverage of DAO layer.