remove unnecessary check
update Tests