Fix dependency
Fix test