dictionary and context_instance and superseded by context. Refactored tests that relied context_instance with more modern idioms.
dictionary and context_instance and superseded by context. Refactored tests that relied context_instance with more modern idioms.