Update to new integration test convention.