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

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