Fix: Unit test failure fixes