some tests
merging