fix test
merged