Fixing issue #1104 and updating tests.

You're right about the test - that's why we have them. Maybe this is then just an aesthetic question. Let's keep your change then.