Fix: unit tests