Bug 868653 - Rework test so it passes while asserting same thing r=kgran...

...don