Some new tests

Change-Id: Idcc3716bdc0d8418c4c764a0428daeaa4258463c
Some new Dao and Tests
Change-Id: Ib6ecc3ceed1d70f54f0533d27ee64b8c78b117a4
Change-Id: I89aee2b82bf9e08a16608ee43101b2d49ce7c881