added fileOnlyInBranchTest to branchTest
dsaf
finished fix
Merge branch 'master' into branchTest