Fix failing tests (test case translation issues)