Attempt to fix visibility issues in patcing tests