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

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