Run tests in loop to remove duplicated code

I moved the test for marionette connectivity up to where we reboot the phone rather than the first time we try to run a test.

I've renamed the expected results file to make them consistent with the loop variable.