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

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