Fixing tests with new dependencies