Add test cases for #99