Keep test up to date while working:

git checkout test
git fetch origin
git rebase origin/master   # or merge if your team prefers

When done, merge back into master:

git checkout master
git fetch origin
git merge test   # or git rebase test, depending on policy
git push origin master