Update canossa
Add some tests