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

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