[enh] Improved tests coverage a lot