S64847: updated tests to handle new Schema