Refactor some Gifts project tests.