Updated dependencies
Fixed up a few tests