Attempt to fix visibility issues in patching tests