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

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