Bump deps and fix tests for 1.6.0 compatibility