ENG-6791 removed while loop and temporary test code