Remove skipped empty tests from cluster tests if possible and remove duplicate tests

[prateek-kumar-improving]

1. Remove skipped empty tests from cluster tests if possible
2. Also, try to remove if there are any duplicate tests.