Improved the integration test