Add replasing, fix string splitting
Improve test data. Rename name of variable of key-value stream