Fix windows compilation of demo tests; patch from Gisle Vanem