ENG-5741: refactor tests