superficial adaptation of the context tests to comply with with_context API change (yes more testing is needed)