Fix 2 failing tests from recent changes