Bug 1071590 - Refactor update tests for stability and backup/restore of channel files. r=amatei, r=aeftimie