Fixing demo tests