Improvements on test demo