Fix dependencies
Fix test