Bug 1082196 - Update imports in test files to reflect changes to mach's marionette script made in bug 1050511. r=dmose