Added with_context to test