Fix: Unit tests