fixed up Demo and Test
fixed Demo and Test