Fixed merge conflict.
added unit tests