Making test data a bit more consistent