Merge "Modify TestApps to use mandatory source URI"