Rewrite examples
Fix tests after changing examples