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

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