finishing DAL and Tests preperations