Completed the example and test.

Still based on an older version, then refactored in separate projects.