Fix 2 of the failing tests