more tests
merged