A new test example and other cleanup.