[enh] Improved tests coverage to 100%