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

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