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

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