I'm happy to take another approach - I'm just going off the examples you have in the test suite right now. Let me know what you want to do instead.

I'll move it back when combining the specs.