Fix dependencies
Fix tests