Added test for #18 - closes #18