more robust retry mechanism for LD tests
refactoring and purging of duplicate tests