Merge integration tests updates