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

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