added tests
merged