updated test
merged