Updated testing branch to current branch 6march