new tests
merge