Fix: unit test regression fix