Break extra_context test into 2 tests, to cover both combinations with default_context.