DAO tests and Tools tests updated