Added failing test for gh-25.
Fixed gh-25