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

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