Russell,

Good point, apologies for that. This was just an extra attempt at mixing the new functionality in with the old, but in retrospect it is a bad idea. I will re-submit the pull request without modifying the old test.