Develop

changed demo to be driven by testng, fixed potential null pointer issue