Add unit test for #37