Fix 19 tests.