Added test for saving and replace
Fixed issue with removing data from native fields