Added tests
merge