Fix a test based on the resolution of #1609

This old test (from WSR) was commented out pending the resolution of
issue #1609.

I've updated the test to track the current semantics.