Updated dependencies, fixed unit tests