More work on the integration tests.