Also let's add some tests for `extra_context` being a list of two-tuples and a list of single items (which should throw the `TypeError`).