refactor the depend tests too
refactor the depend tests too