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

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