Fix leaky options object
Add test for context.data leak