Fix tests
Improve example