Simplify examples

(cherry picked from commit be6690d48588724e30a897b6f0df6ad1ac7016d7)
Correct test