update test
update test after merge