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

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