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

This reverts commit c285bc6b5ea952a38e1ce1e607eed4722f1d7077.
Rebase from 'upstream'
Trimmed the branch to only the controller_manager_tests sub directory