Update dependencies
Cleanup tests