ENG-5432-fix Restore commented out tests.