Fix: Test cases fail fix