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

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