Readded test for issue #18