[UPDATE] improve tests coverage