Sync test/ with master
Simple demo page