more tests
merge