Second attempt to fix the failing tests.