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

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