Correct dependencies
Fix tests