Add spec for #655

Hint: This diff is much easier to read if you ignore whitespace