Updated example and tests