Added more test for #15