Fix tests and dependencies.