update test and demo files to different directories
adding basic tests for xcap