ENG-4495: Schema change test improvements