final fix of Dao Junit tests & Dao functionality