Changes related to testing and getting paths right for sample app builds.