Update DemoTest and Add DemoVMTest tests