improved tests coverage