Add Mixed demo and test update