Updated dependencies (and fixed tests accordingly)