Added new tests.
Simplify examples.