Finished one pass through cleaning up the integration tests.