Minor improvements to test/demo/example