Add unit test for #16