Improve the integration test script a bit