Imporved full demo test
Imporved full demo test