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

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