Fix tests and update example