Adds test for #134.
Merge #551 r=@tcr: Adds test for #134.

This might fail on Linux.