fix integration test errors