Fix unit test warnings
The data keys are supposed to be unique, when adding data in a for loop, use the function that can help with that.
The data keys are supposed to be unique, when adding data in a for loop, use the function that can help with that.