updated tests;db;dao;reports