ENG-5066: minor changes to test cases.