Added test for #16