panagosg7 Porting demo tests to latest version

Latest commit aaccc72

May 30, 2016