added tests
merging