[enh] Removed deprecated methods
[enh] Added tests on templating
[enh] Improved tests coverage to 100%