Patched tests to reflect latest closure mechanism.