fix replace call for 6+ arguments to call
Release v2.1.1
Add tests
Release v2.1.2