rewrote dao unit tests