Fixup tests and examples.

