I would merge all of this directly into `cleanUp` itself in the `gaiatest.py` file.

We began using the cleanUp to set the device into a start instead of tearDown because the tearDown was not trustworthy. In some cases if the connection to the device was broken then the tearDown would not occur, leaving the device in an inconsistent state. Thus we find doing this in the setUp to be a bit more trustworthy.