Fix tests
Update dependencies