FIX tests in examples, still 5 remaining failures