Improved test coverage of DAO layer.