This is the last of your feedback I need to incorporate. Only reason why I haven't done it yet is because I can't really think of a way to make this a completely separate test without either a) lots of code duplication, or b) a significant refactor.

If you don't mind this separate test being almost a copy-paste of the regular test, I can go ahead and do that pretty quickly.