refactor gift unit tests
pull remote