Fix notebook representation
Fix tests