Add test cases for #27