Merge "Include non-local tests by path"