[JENKINS-23004] Refactor 1st AD test based on OfficeHrs learning thx2 KK