Make tests pass with new dependencies