Final fix-up for example tests