DAO Layer tests almost done