Fix some examples and tests