I can't seem to run tests right now, I can hold off on this request until I get that fixed. I imagine it's going to look very similar to your initial test, we might want to DRY it up a little, but I'll write out what I think it should look like.