Fix tests, add more examples