Extracted DAO, divided one large test into few smaller ones