Fix phone failure test
Fix ContributionTest