Improve IntegrationTest