working on full tests coverage