Upgrade dependencies, fix test.