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

This reverts commit 3c0f2a75d6147ceb0efa936ca314e57540d2f2f5.
Rebase from 'upstream'
Trimmed the branch to only the sr_ronex_test sub directory