Attempt to fix integration tests sporadic failures