Improved dao unit tests