Improve test demo