finish DAO and Service layer and tests