NOJIRA - clean up dao package and add stub unit tests