Fix a bug around feeding back okuri-ari entry
Add some tests
Minor fix
Update canossa
Minor fix