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

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