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

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