Maintenance of a few of the integration tests. There's a *lot* of work required here to get this back up and running...
Adding a few comments