Update deps and fix tests