Add unit test for #22