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

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