Fixed build of Demo and Test apps