Cleanup the integration test a little.