Fix tests & dependencies.