New examples
Fix tests