adding unit tests, adding encoding property
merging