Fixing new dependencies, fixing tests