added unit tests
merge