Revert "Trimmed the branch to only the test_diagnostic_aggregator sub directory"

This reverts commit 08c95e214530258ad18db5f1f2c9f5e58720232d.
Rebase from 'upstream'
Trimmed the branch to only the test_diagnostic_aggregator sub directory