added test
merged