fixed bug with remove null
update test