Add a few tests for #47