Updated dependencies and fixed build
Fixed tests