- improved tests coverage