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

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