No changes from here down other than wrapping in a separate context (as the `before` block for the remainder of the specs breaks the one I added above).