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

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