Fix: make tests pass